.directory objects/ephemeris.cpp objects/ephemeris.h objects/pvt.cpp objects/pvt.h objects/sv_select.cpp objects/sv_select.h objects/telemetry.cpp objects/telemetry.h @@ -3,8 +3,8 @@ <cproject> <storageModule moduleId="org.eclipse.cdt.core.settings"> -<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.2104979463"> -<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.2104979463" moduleId="org.eclipse.cdt.core.settings" name="Debug"> +<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.77584363"> +<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.77584363" moduleId="org.eclipse.cdt.core.settings" name="Debug"> <externalSettings/> <extensions> <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> @@ -15,23 +15,32 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> -<configuration artifactName="gps-sdr" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.2104979463" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug"> -<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.2104979463." name="/" resourcePath=""> -<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1315644368" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug"> -<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1068335862" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/> -<builder buildPath="${workspace_loc:/gps-sdr/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1402111636" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/> -<tool id="cdt.managedbuild.tool.gnu.archiver.base.1072028718" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> -<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1064811947" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"> -<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.2061905273" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> -<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1532906187" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> +<configuration artifactName="gps-sdr" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.77584363" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug"> +<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.77584363." name="/" resourcePath=""> +<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.192384869" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug"> +<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.727751360" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/> +<builder buildPath="${workspace_loc:/gps-sdr/}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1990275351" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/> +<tool id="cdt.managedbuild.tool.gnu.archiver.base.1973994625" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.316470541" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"> +<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.493837322" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> +<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.154312303" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1499118183" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> </tool> -<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.297552181" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"> -<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.2034179796" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/> -<option id="gnu.c.compiler.exe.debug.option.debugging.level.1698950407" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/> +<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.776235249" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"> +<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1024402410" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/> +<option id="gnu.c.compiler.exe.debug.option.debugging.level.659731994" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.926966354" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> +</tool> +<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1522152180" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.275877220" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"> +<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1954109296" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> +<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> +<additionalInput kind="additionalinput" paths="$(LIBS)"/> +</inputType> +</tool> +<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1993913674" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug"> +<inputType id="cdt.managedbuild.tool.gnu.assembler.input.199240112" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> </tool> -<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.2088896898" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/> -<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1826194429" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/> -<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.846231409" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug"/> </toolChain> </folderInfo> </configuration> @@ -118,7 +127,7 @@ <parser enabled="true"/> </scannerInfoProvider> </profile> -<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.2104979463;cdt.managedbuild.config.gnu.exe.debug.2104979463.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.297552181;cdt.managedbuild.tool.gnu.c.compiler.input.225396790"> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.77584363;cdt.managedbuild.config.gnu.exe.debug.77584363.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.776235249;cdt.managedbuild.tool.gnu.c.compiler.input.602098326"> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> <buildOutputProvider> @@ -201,7 +210,7 @@ </scannerInfoProvider> </profile> </scannerConfigBuildInfo> -<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.2104979463;cdt.managedbuild.config.gnu.exe.debug.2104979463.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1064811947;cdt.managedbuild.tool.gnu.cpp.compiler.input.1676041878"> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.77584363;cdt.managedbuild.config.gnu.exe.debug.77584363.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.316470541;cdt.managedbuild.tool.gnu.cpp.compiler.input.1204114487"> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> <buildOutputProvider> @@ -286,9 +295,37 @@ </scannerConfigBuildInfo> </storageModule> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> +<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> +<buildTargets> +<target name="gps-sdr" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> +<buildCommand>make</buildCommand> +<buildArguments/> +<buildTarget>gps-sdr</buildTarget> +<stopOnError>true</stopOnError> +<useDefaultCommand>false</useDefaultCommand> +<runAllBuilders>false</runAllBuilders> +</target> +<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> +<buildCommand>make</buildCommand> +<buildArguments/> +<buildTarget>clean</buildTarget> +<stopOnError>true</stopOnError> +<useDefaultCommand>true</useDefaultCommand> +<runAllBuilders>false</runAllBuilders> +</target> +<target name="extras" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> +<buildCommand>make</buildCommand> +<buildArguments/> +<buildTarget>extras</buildTarget> +<stopOnError>true</stopOnError> +<useDefaultCommand>true</useDefaultCommand> +<runAllBuilders>false</runAllBuilders> +</target> +</buildTargets> +</storageModule> </cconfiguration> -<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.577884912"> -<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.577884912" moduleId="org.eclipse.cdt.core.settings" name="Release"> +<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.2008364267"> +<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.2008364267" moduleId="org.eclipse.cdt.core.settings" name="Release"> <externalSettings/> <extensions> <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> @@ -299,23 +336,32 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> -<configuration artifactName="gps-sdr" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.577884912" name="Release" parent="cdt.managedbuild.config.gnu.exe.release"> -<folderInfo id="cdt.managedbuild.config.gnu.exe.release.577884912." name="/" resourcePath=""> -<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.669590308" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release"> -<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1386884189" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/> -<builder buildPath="${workspace_loc:/gps-sdr/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1406140088" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/> -<tool id="cdt.managedbuild.tool.gnu.archiver.base.354596229" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> -<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1565930157" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"> -<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1924126081" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> -<option id="gnu.cpp.compiler.exe.release.option.debugging.level.462324478" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> +<configuration artifactName="gps-sdr" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.2008364267" name="Release" parent="cdt.managedbuild.config.gnu.exe.release"> +<folderInfo id="cdt.managedbuild.config.gnu.exe.release.2008364267." name="/" resourcePath=""> +<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.175498023" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release"> +<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.709887846" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/> +<builder buildPath="${workspace_loc:/gps-sdr/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1941379052" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/> +<tool id="cdt.managedbuild.tool.gnu.archiver.base.1295504480" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.360335903" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"> +<option id="gnu.cpp.compiler.exe.release.option.optimization.level.601843637" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> +<option id="gnu.cpp.compiler.exe.release.option.debugging.level.526710715" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.514879585" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> +</tool> +<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.454239375" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"> +<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.230957965" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/> +<option id="gnu.c.compiler.exe.release.option.debugging.level.282954418" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.36191756" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> </tool> -<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1095741912" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"> -<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1997955697" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/> -<option id="gnu.c.compiler.exe.release.option.debugging.level.941441799" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/> +<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.231746357" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.952224396" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"> +<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2076835108" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> +<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> +<additionalInput kind="additionalinput" paths="$(LIBS)"/> +</inputType> +</tool> +<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.477966137" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release"> +<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1112600992" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> </tool> -<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.923361994" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/> -<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1758890618" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/> -<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1700079143" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release"/> </toolChain> </folderInfo> </configuration> @@ -402,7 +448,7 @@ <parser enabled="true"/> </scannerInfoProvider> </profile> -<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.2104979463;cdt.managedbuild.config.gnu.exe.debug.2104979463.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.297552181;cdt.managedbuild.tool.gnu.c.compiler.input.225396790"> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.77584363;cdt.managedbuild.config.gnu.exe.debug.77584363.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.776235249;cdt.managedbuild.tool.gnu.c.compiler.input.602098326"> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> <buildOutputProvider> @@ -485,7 +531,7 @@ </scannerInfoProvider> </profile> </scannerConfigBuildInfo> -<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.2104979463;cdt.managedbuild.config.gnu.exe.debug.2104979463.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1064811947;cdt.managedbuild.tool.gnu.cpp.compiler.input.1676041878"> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.77584363;cdt.managedbuild.config.gnu.exe.debug.77584363.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.316470541;cdt.managedbuild.tool.gnu.cpp.compiler.input.1204114487"> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> <buildOutputProvider> @@ -569,9 +615,38 @@ </profile> </scannerConfigBuildInfo> </storageModule> +<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> +<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> +<buildTargets> +<target name="gps-sdr" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> +<buildCommand>make</buildCommand> +<buildArguments/> +<buildTarget>gps-sdr</buildTarget> +<stopOnError>true</stopOnError> +<useDefaultCommand>false</useDefaultCommand> +<runAllBuilders>false</runAllBuilders> +</target> +<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> +<buildCommand>make</buildCommand> +<buildArguments/> +<buildTarget>clean</buildTarget> +<stopOnError>true</stopOnError> +<useDefaultCommand>true</useDefaultCommand> +<runAllBuilders>false</runAllBuilders> +</target> +<target name="extras" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> +<buildCommand>make</buildCommand> +<buildArguments/> +<buildTarget>extras</buildTarget> +<stopOnError>true</stopOnError> +<useDefaultCommand>true</useDefaultCommand> +<runAllBuilders>false</runAllBuilders> +</target> +</buildTargets> +</storageModule> </cconfiguration> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> -<project id="gps-sdr.cdt.managedbuild.target.gnu.exe.1829872519" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/> +<project id="gps-sdr.cdt.managedbuild.target.gnu.exe.1006261707" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/> </storageModule> </cproject> .cproject @@ -31,7 +31,7 @@ </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.buildLocation</key> - <value>${workspace_loc:/gps-sdr/Debug}</value> + <value>${workspace_loc:/gps-sdr/}</value> </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.cleanBuildTarget</key> .project @@ -1,4 +1,4 @@ -#Mon Jun 23 17:32:06 EDT 2008 +#Wed May 06 10:33:13 EDT 2009 eclipse.preferences.version=1 indexer/indexerId=org.eclipse.cdt.core.fastIndexer indexerId=org.eclipse.cdt.core.fastIndexer .settings/org.eclipse.cdt.core.prefs @@ -30,6 +30,13 @@ #define LINUX_OS +/* Software Version */ +/*----------------------------------------------------------------------------------------------*/ +#define SOFTWARE_VERSION_MAJOR (2) +#define SOFTWARE_VERSION_MINOR (5) +#define SOFTWARE_VERSION_POSTFIX (0) +/*----------------------------------------------------------------------------------------------*/ + /* The most important thing, the NUMBER OF CORRELATORS IN THE RECEIVER and the NUMBER OF CPUs */ /*----------------------------------------------------------------------------------------------*/ #define MAX_CHANNELS (12) //!< Number of channel objects @@ -65,41 +72,47 @@ /*----------------------------------------------------------------------------------------------*/ -/* Acquisition defines */ +/*! Config the SV Select */ /*----------------------------------------------------------------------------------------------*/ -#define MASK_ANGLE (5) //!< Add this many degrees to altitude dependant mask -#define ACQ_STRONG (0) //!< Acq strong type -#define ACQ_MEDIUM (1) //!< Acq medium type -#define ACQ_WEAK (2) //!< Acq weak type - -#define ACQ_STRONG_STATE (1) //!< 0 for off, 1 for on, 2 for hot acquisition only -#define ACQ_MEDIUM_STATE (2) //!< 0 for off, 1 for on, 2 for hot acquisition only -#define ACQ_WEAK_STATE (2) //!< 0 for off, 1 for on, 2 for hot acquisition only - -#define ACQ_ITERATIONS (1) //!< Do this many acqs at a given type before moving to next type -#define THRESH_STRONG (1.3e7) //!< Threshold for strong signal detection -#define THRESH_MEDIUM (1.5e7) //!< Threshold for medium signal detection -#define THRESH_WEAK (1.5e7) //!< Threshold for weak signal detection -#define MAX_DOPPLER (45000) //!< Set the maximum Doppler frequency -#define DOPPLER_RANGE (1000) //!< Search this Doppler range for hot acquisitions +#define MASK_ANGLE (0) //!< Add this many degrees to altitude dependant mask +#define MAX_ANTENNA (1) //!< 6 ADCs on board +#define ACQ_MODULO_WEAK (8) //!< Do this many weak acqs per 32 PRN strong search +#define MAX_DOPPLER_ABSOLUTE (100000) //!< Limit any and all Dopplers the be within this range +#define MAX_DOPPLER_STRONG (18000) //!< Cold Doppler search space for strong signal +#define MAX_DOPPLER_MEDIUM (9000) //!< Cold Doppler search space for strong signal +#define MAX_DOPPLER_WEAK (9000) //!< Cold Doppler search space for weak signal +#define MAX_DOPPLER_WARM (1000) //!< Search this much Doppler space if state information is available +#define ACQ_OPERATION_STRONG (ACQ_OPERATION_COLD) //!< Acq strong mode (2 = cold & warm) +#define ACQ_OPERATION_MEDIUM (ACQ_OPERATION_WARM) //!< Acq strong mode (2 = cold & warm) +#define ACQ_OPERATION_WEAK (ACQ_OPERATION_DISABLED) //!< Acq weak mode (2 = warm only) +#define THRESH_STRONG (0) //!< Thats right zero! 40 dB-Hz and above acquisition threshold +#define THRESH_MEDIUM (0) //!< Thats right zero! 30 dB-Hz and above acquisition threshold +#define THRESH_WEAK (0) //!< 30 dB-Hz and below (down to ~22 dB-Hz <-- LIAR!) acquisition threshold /*----------------------------------------------------------------------------------------------*/ -/* Correlator Defines */ +/* Correlator Defines */ /*----------------------------------------------------------------------------------------------*/ #define CORR_DELAYS (1) //!< Number of delays to calculate (plus-minus) #define CORR_SPACING (.5) //!< How far should the correlators be spaced (chips) #define FRAME_SIZE_PLUS_2 (12) //!< 10 words per frame, 12 = 10 + 2 -#define MEASUREMENT_INT (100) //!< Packets of ~1ms data #define CODE_BINS (20) //!< Partial code offset bins code resolution -> 1 chip/X bins #define CARRIER_SPACING (20) //!< Spacing of bins (Hz) -#define CARRIER_BINS (MAX_DOPPLER/CARRIER_SPACING) //!< Number of pre-sampled carrier wipeoff bins +#define CARRIER_BINS (MAX_DOPPLER_ABSOLUTE/CARRIER_SPACING) //!< Number of pre-sampled carrier wipeoff bins +/*----------------------------------------------------------------------------------------------*/ + + +/* Measurement/PVT Defines */ +/*----------------------------------------------------------------------------------------------*/ +#define MEASUREMENT_INT (100) //!< Packets of ~1ms data #define ICP_TICS (5) //!< Number of measurement ints (plus-minus) to calculate ICP, //!< this cannot exceed TICS_PER_SECOND/2 !!!! +//#define TICS_2_SECONDS (MEASUREMENT_INT/1000) +//#define TICS_PER_SECOND (1000/MEASUREMENT_INT) -#define TICS_2_SECONDS (MEASUREMENT_INT/1000) -#define TICS_PER_SECOND (1000/MEASUREMENT_INT) -#define ACQS_PER_SECOND (20) +#define MEASUREMENTS_PER_SECOND (1000/MEASUREMENT_INT) +#define SECONDS_PER_TICK (MEASUREMENT_INT/1000) +#define PVT_ITERATIONS (10) //!< Max number of PVT iterations /*----------------------------------------------------------------------------------------------*/ @@ -117,22 +130,21 @@ /* Associate each task with a enum */ /*----------------------------------------------------------------------------------------------*/ -#define MAX_TASKS (16) //!< Max task number (used to allocate arrays) +#define MAX_TASKS (14) //!< Max task number (used to allocate arrays) enum TASK_IDS { - CORRELATOR_TASK_ID = CPU_CORES, //!< Bottom tasks are the correlators, which is a variable - POST_PROCESS_TASK_ID, - FIFO_TASK_ID, + TRACKING_ISR_TASK_ID, + PVT_TASK_ID, + PPS_TASK_ID, + GEONS_TASK_ID, COMMANDO_TASK_ID, - TELEMETRY_TASK_ID, - SERIAL_TELEMETRY_TASK_ID, - KEYBOARD_TASK_ID, + ACQUISITION_TASK_ID, EPHEMERIS_TASK_ID, SV_SELECT_TASK_ID, - ACQUISITION_TASK_ID, - PVT_TASK_ID, + TELEMETRY_TASK_ID, EKF_TASK_ID, - LAST_TASK_ID + PATIENCE_TASK_ID, + IDLE_TASK_ID }; /*----------------------------------------------------------------------------------------------*/ includes/config.h @@ -38,40 +38,42 @@ /*----------------------------------------------------------------------------------------------*/ EXTERN class Keyboard *pKeyboard; //!< Handle user input EXTERN class FIFO *pFIFO; //!< Get data and pass it into the receiver -//EXTERN class PVT *pPVT; //!< Do the PVT solution -//EXTERN class Ephemeris *pEphemeris; //!< Extract the ephemeris +EXTERN class PVT *pPVT; //!< Do the PVT solution +EXTERN class Ephemeris *pEphemeris; //!< Extract the ephemeris EXTERN class Acquisition *pAcquisition; //!< Perform acquisitions EXTERN class Correlator *pCorrelator; //!< Correlator EXTERN class Channel *pChannels[MAX_CHANNELS]; //!< Channels (uses correlations to close the loops) -//EXTERN class SV_Select *pSV_Select; //!< Contains the channels and drives the channel objects -//EXTERN class Telemetry *pTelemetry; //!< Simple ncurses interface +EXTERN class SV_Select *pSV_Select; //!< Contains the channels and drives the channel objects +EXTERN class Telemetry *pTelemetry; //!< Simple ncurses interface //EXTERN class Post_Process *pPost_Process; //!< Drive the receiver from a recorded file //EXTERN class Serial_Telemetry *pSerial_Telemetry; //!< Dump data to GUI over named pipe or serial //EXTERN class Commando *pCommando; //!< Process and execute commands /*----------------------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------------------*/ -EXTERN int32 grun; //!< Keep all the threads active (technically, this should be mutex protected, but eh, who cares? ) -EXTERN Options_S gopt; //!< Global receiver options -EXTERN struct timeval starttime; //!< Get receiver start time +EXTERN int32 grun; //!< Keep all the threads active (technically, this should be mutex protected, but eh, who cares? ) +EXTERN Options_S gopt; //!< Global receiver options +EXTERN struct timeval starttime; //!< Get receiver start time /*----------------------------------------------------------------------------------------------*/ /* Part 3, Pipes */ /*----------------------------------------------------------------------------------------------*/ /* Interplay between acquisition and tracking */ -EXTERN int32 SVS_2_ACQ_P[2]; //!< \ingroup PIPES Request an acquisition because some of the channels are empty +EXTERN int32 SVS_2_COR_P[2]; //!< \ingroup PIPES Send an acquisition result to the correlator to start a channel +EXTERN int32 CHN_2_EPH_P[2]; //!< \ingroup PIPES Output raw subframes to Ephemeris +EXTERN int32 PVT_2_TLM_P[2]; //!< \ingroup PIPES Output PVT state to Telemetry +EXTERN int32 SVS_2_TLM_P[2]; //!< \ingroup PIPES Output predicted SV states to Telemetry +EXTERN int32 EKF_2_TLM_P[2]; //!< \ingroup PIPES Output EKF state to Telemetry +EXTERN int32 CMD_2_TLM_P[2]; //!< \ingroup PIPES Output results of commands to Telemetry EXTERN int32 ACQ_2_SVS_P[2]; //!< \ingroup PIPES Request an acquisition because some of the channels are empty -EXTERN int32 SVS_2_COR_P[2]; //!< \ingroup PIPES Get an acquisition result -EXTERN int32 COR_2_PVT_P[2]; //!< \ingroup PIPES Output measurements to PVT -EXTERN int32 CHN_2_EPH_P[2]; //!< \ingroup PIPES Dump raw subframes to Ephemeris -EXTERN int32 PVT_2_TLM_P[2]; //!< \ingroup PIPES Send latest nav solution to GUI -EXTERN int32 EPH_2_TLM_P[2]; //!< \ingroup PIPES Send latest ephemeris to GUI -EXTERN int32 SVS_2_TLM_P[2]; //!< \ingroup PIPES Send predicted SV states to GUI -EXTERN int32 PVT_2_SVS_P[2]; //!< \ingroup PIPES Output nav state to sat select -EXTERN int32 TLM_2_CMD_P[2]; //!< \ingroup PIPES Send received commands to Commando -EXTERN int32 CMD_2_TLM_P[2]; //!< \ingroup PIPES Send results of commands to Telemetry -EXTERN int32 COR_2_ACQ_P[2]; //!< \ingroup PIPES Send packets of IF data to the Acquisition +EXTERN int32 EKF_2_SVS_P[2]; //!< \ingroup PIPES Output EKF state to SV Select +EXTERN int32 PVT_2_SVS_P[2]; //!< \ingroup PIPES Output PVT state to SV Select +EXTERN int32 TLM_2_CMD_P[2]; //!< \ingroup PIPES Output received commands to Commando +EXTERN int32 SVS_2_ACQ_P[2]; //!< \ingroup PIPES Request an acquisition because some of the channels are empty +EXTERN int32 COR_2_ACQ_P[2]; //!< \ingroup PIPES Output packets of IF data to the Acquisition +EXTERN int32 ISRP_2_PVT_P[2]; //!< \ingroup PIPES Output measurement preamble to PVT +EXTERN int32 ISRM_2_PVT_P[2]; //!< \ingroup PIPES Output measurements to PVT /*----------------------------------------------------------------------------------------------*/ includes/globals.h @@ -62,7 +62,7 @@ #include "sdr_structs.h" //!< Structs used for interprocess communication #include "protos.h" //!< Functions & thread prototypes #include "simd.h" //!< Include the SIMD functionality -#include "globals.h" +#include "globals.h" //!< Global objects live here /*----------------------------------------------------------------------------------------------*/ /* Include the "Threaded Objects" */ includes/includes.h @@ -29,6 +29,7 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1 #define IF_SAMPLE_FREQUENCY (2048000) //!< How many CPX samples in a second #define IF_FREQUENCY (160000) //!< IF frequency + #define ZERO_DOPPLER_RATE (IF_FREQUENCY) #define IF_SAMPS_MS (2048) //!< Samples per millisecond #endif includes/signaldef.h @@ -34,12 +34,11 @@ #include "channel.h" //!< Tracking channels #include "correlator.h" //!< Correlator #include "acquisition.h" //!< Acquisition -//#include "pvt.h" //!< PVT solution -//#include "ephemeris.h" //!< Ephemeris decode -//#include "telemetry.h" //!< Ncurses telemetry -//#include "serial_telemetry.h" //!< Serial/GUI telemetry +#include "pvt.h" //!< PVT solution +#include "ephemeris.h" //!< Ephemeris decode +#include "telemetry.h" //!< Serial/GUI telemetry //#include "commando.h" //!< Command interface -//#include "sv_select.h" //!< Drives acquisition/reacquisition process +#include "sv_select.h" //!< Drives acquisition/reacquisition process //#include "post_process.h" //!< Run the receiver from a file /*----------------------------------------------------------------------------------------------*/ @@ -147,8 +146,8 @@ void Parse_Arguments(int32 argc, char* argv[]) gopt.ncurses = 1; gopt.gui = 0; gopt.serial = 0; - gopt.doppler_min = -MAX_DOPPLER; - gopt.doppler_max = MAX_DOPPLER; + gopt.doppler_min = -MAX_DOPPLER_STRONG; + gopt.doppler_max = MAX_DOPPLER_STRONG; gopt.corr_sleep = 500; gopt.startup = 0; gopt.usrp_internal = 0; @@ -321,27 +320,25 @@ int32 Object_Init(void) /* Now do the hard work? */ pAcquisition = new Acquisition(IF_SAMPLE_FREQUENCY, IF_FREQUENCY); -// pEphemeris = new Ephemeris; -// + /* Decode the almanac and ephemerides */ + pEphemeris = new Ephemeris; + /* Get data from either the USRP or disk */ pFIFO = new FIFO; -// pSV_Select = new SV_Select; + pSV_Select = new SV_Select; for(lcv = 0; lcv < MAX_CHANNELS; lcv++) pChannels[lcv] = new Channel(lcv); - pCorrelator = new Correlator(); + pCorrelator = new Correlator(); + + pTelemetry = new Telemetry(); -// if(gopt.ncurses) -// pTelemetry = new Telemetry(); -// else -// pSerial_Telemetry = new Serial_Telemetry(gopt.serial); -// // pCommando = new Commando(); -// -// pPVT = new PVT(gopt.startup); -// + + pPVT = new PVT(); + // if(gopt.post_process) // pPost_Process = new Post_Process(gopt.filename_direct); // @@ -361,27 +358,41 @@ int32 Object_Init(void) /*----------------------------------------------------------------------------------------------*/ + + /*! Initialize all pipes */ /*----------------------------------------------------------------------------------------------*/ int32 Pipes_Init(void) { int32 lcv; - pipe((int *)SVS_2_ACQ_P); - pipe((int *)ACQ_2_SVS_P); + /* Create all of the pipes */ pipe((int *)SVS_2_COR_P); - pipe((int *)COR_2_PVT_P); pipe((int *)CHN_2_EPH_P); pipe((int *)PVT_2_TLM_P); - pipe((int *)EPH_2_TLM_P); pipe((int *)SVS_2_TLM_P); + pipe((int *)EKF_2_TLM_P); + pipe((int *)CMD_2_TLM_P); + pipe((int *)ACQ_2_SVS_P); + pipe((int *)EKF_2_SVS_P); pipe((int *)PVT_2_SVS_P); pipe((int *)TLM_2_CMD_P); - pipe((int *)CMD_2_TLM_P); + pipe((int *)SVS_2_ACQ_P); pipe((int *)COR_2_ACQ_P); + pipe((int *)ISRP_2_PVT_P); + pipe((int *)ISRM_2_PVT_P); + /* Setup some of the non-blocking pipes */ fcntl(COR_2_ACQ_P[WRITE], F_SETFL, O_NONBLOCK); - fcntl(SVS_2_COR_P[READ], F_SETFL, O_NONBLOCK); + fcntl(EKF_2_SVS_P[WRITE], F_SETFL, O_NONBLOCK); + fcntl(SVS_2_TLM_P[WRITE], F_SETFL, O_NONBLOCK); + fcntl(PVT_2_SVS_P[WRITE], F_SETFL, O_NONBLOCK); + fcntl(EKF_2_SVS_P[READ], F_SETFL, O_NONBLOCK); + fcntl(SVS_2_COR_P[READ], F_SETFL, O_NONBLOCK); + fcntl(SVS_2_TLM_P[READ], F_SETFL, O_NONBLOCK); + fcntl(PVT_2_TLM_P[READ], F_SETFL, O_NONBLOCK); + fcntl(SVS_2_TLM_P[READ], F_SETFL, O_NONBLOCK); + fcntl(EKF_2_TLM_P[READ], F_SETFL, O_NONBLOCK); if(gopt.verbose) { @@ -407,43 +418,34 @@ int32 Thread_Init(void) /* Start the keyboard thread to handle user input from stdio */ pKeyboard->Start(); -// /* Startup the PVT sltn */ -// pPVT->Start(); -// - /* Start up the FIFO */ - pFIFO->Start(); -// + /* Startup the PVT sltn */ + pPVT->Start(); + // /* Start up the correlators */ pCorrelator->Start(); /* Start up the acquistion */ pAcquisition->Start(); -// /* Start up the ephemeris */ -// pEphemeris->Start(); -// -// /* Start up the command interface */ + /* Start up the ephemeris */ + pEphemeris->Start(); + + /* Start up the command interface */ // pCommando->Start(); -// -// /* Start the SV select thread */ -// pSV_Select->Start(); -// -// //if(gopt.verbose) -// { -// printf("Cleared Thread Init\n"); -// fflush(stdout); -// } -// -// /* Last thing to do */ -// if(gopt.ncurses) -// pTelemetry->Start(); -// else -// pSerial_Telemetry->Start(); -// + + /* Start the SV select thread */ + pSV_Select->Start(); + + /* Last thing to do */ + pTelemetry->Start(); + // /* Do the post process */ // if(gopt.post_process) // pPost_Process->Start(); + /* Start up the FIFO */ + pFIFO->Start(); + return(1); } main/init.cpp @@ -33,12 +33,12 @@ #include "channel.h" //!< Tracking channels #include "correlator.h" //!< Correlator #include "acquisition.h" //!< Acquisition -//#include "pvt.h" //!< PVT solution -//#include "ephemeris.h" //!< Ephemeris decode +#include "pvt.h" //!< PVT solution +#include "ephemeris.h" //!< Ephemeris decode //#include "telemetry.h" //!< Ncurses telemetry //#include "serial_telemetry.h" //!< Serial/GUI telemetry //#include "commando.h" //!< Command interface -//#include "sv_select.h" //!< Drives acquisition/reacquisition process +#include "sv_select.h" //!< Drives acquisition/reacquisition process //#include "post_process.h" //!< Run the receiver from a file /*----------------------------------------------------------------------------------------------*/ @@ -53,33 +53,33 @@ void Thread_Shutdown(void) /* Start the keyboard thread to handle user input from stdio */ pKeyboard->Stop(); + /* Stop the FIFO */ + pFIFO->Stop(); + /* Stop the telemetry */ // if(gopt.ncurses) // pTelemetry->Stop(); // else // pSerial_Telemetry->Stop(); -// - /* Stop the FIFO */ - pFIFO->Stop(); -// -// /* Uh-oh */ -// pPVT->Stop(); -// -// /* Stop the correlator */ + + /* Uh-oh */ + pPVT->Stop(); + + /* Stop the correlator */ pCorrelator->Stop(); /* Stop the acquistion */ pAcquisition->Stop(); -// -// /* Stop the ephemeris */ -// pEphemeris->Stop(); -// + + /* Stop the ephemeris */ + pEphemeris->Stop(); + // /* Stop the command interface */ // pCommando->Stop(); -// -// /* Stop the tracking */ -// pSV_Select->Stop(); -// + + /* Stop the tracking */ + pSV_Select->Stop(); + // /* Stop spoofing my named pipe yo */ // if(gopt.post_process) // pPost_Process->Stop(); @@ -93,32 +93,35 @@ void Thread_Shutdown(void) void Pipes_Shutdown(void) { - int32 lcv; - - close(SVS_2_ACQ_P[READ]); - close(ACQ_2_SVS_P[READ]); close(SVS_2_COR_P[READ]); - close(COR_2_PVT_P[READ]); close(CHN_2_EPH_P[READ]); close(PVT_2_TLM_P[READ]); - close(EPH_2_TLM_P[READ]); close(SVS_2_TLM_P[READ]); + close(EKF_2_TLM_P[READ]); + close(CMD_2_TLM_P[READ]); + close(ACQ_2_SVS_P[READ]); + close(EKF_2_SVS_P[READ]); close(PVT_2_SVS_P[READ]); close(TLM_2_CMD_P[READ]); - close(CMD_2_TLM_P[READ]); + close(SVS_2_ACQ_P[READ]); close(COR_2_ACQ_P[READ]); - close(SVS_2_ACQ_P[WRITE]); - close(ACQ_2_SVS_P[WRITE]); + close(ISRP_2_PVT_P[READ]); + close(ISRM_2_PVT_P[READ]); + close(SVS_2_COR_P[WRITE]); - close(COR_2_PVT_P[WRITE]); close(CHN_2_EPH_P[WRITE]); close(PVT_2_TLM_P[WRITE]); - close(EPH_2_TLM_P[WRITE]); close(SVS_2_TLM_P[WRITE]); + close(EKF_2_TLM_P[WRITE]); + close(CMD_2_TLM_P[WRITE]); + close(ACQ_2_SVS_P[WRITE]); + close(EKF_2_SVS_P[WRITE]); close(PVT_2_SVS_P[WRITE]); close(TLM_2_CMD_P[WRITE]); - close(CMD_2_TLM_P[WRITE]); + close(SVS_2_ACQ_P[WRITE]); close(COR_2_ACQ_P[WRITE]); + close(ISRP_2_PVT_P[WRITE]); + close(ISRM_2_PVT_P[WRITE]); } /*----------------------------------------------------------------------------------------------*/ @@ -140,11 +143,11 @@ void Object_Shutdown(void) delete pKeyboard; delete pAcquisition; -// delete pEphemeris; + delete pEphemeris; // delete pFIFO; -// delete pSV_Select; + delete pSV_Select; // delete pTelemetry; -// delete pPVT; + delete pPVT; // delete pCommando; } main/shutdown.cpp @@ -76,7 +76,7 @@ Acquisition::Acquisition(float _fsample, float _fif):Threaded_Object("ACQTASK") /* Acq state */ sv = 0; - state = ACQ_STRONG; + state = ACQ_TYPE_STRONG; /* Grab some constants */ fif = _fif; @@ -293,7 +293,7 @@ Acq_Command_S Acquisition::doAcqStrong(int32 _sv, int32 _doppmin, int32 _doppmax result->sv = _sv; - result->type = ACQ_STRONG; + result->type = ACQ_TYPE_STRONG; if(result->magnitude > THRESH_STRONG) result->success = 1; @@ -428,7 +428,7 @@ Acq_Command_S Acquisition::doAcqMedium(int32 _sv, int32 _doppmin, int32 _doppmax result->sv = _sv; - result->type = ACQ_MEDIUM; + result->type = ACQ_TYPE_MEDIUM; if(result->magnitude > THRESH_MEDIUM) result->success = 1; @@ -584,7 +584,7 @@ Acq_Command_S Acquisition::doAcqWeak(int32 _sv, int32 _doppmin, int32 _doppmax) result->sv = _sv; - result->type = ACQ_WEAK; + result->type = ACQ_TYPE_WEAK; if(result->magnitude > THRESH_WEAK) result->success = 1; @@ -609,16 +609,16 @@ void Acquisition::Acquire() switch(request.type) { - case ACQ_STRONG: - doPrepIF(ACQ_STRONG, buff); + case ACQ_TYPE_STRONG: + doPrepIF(ACQ_TYPE_STRONG, buff); doAcqStrong(request.sv, request.mindopp, request.maxdopp); break; - case ACQ_MEDIUM: - doPrepIF(ACQ_MEDIUM, buff); + case ACQ_TYPE_MEDIUM: + doPrepIF(ACQ_TYPE_MEDIUM, buff); doAcqMedium(request.sv, request.mindopp, request.maxdopp); break; - case ACQ_WEAK: - doPrepIF(ACQ_WEAK, buff); + case ACQ_TYPE_WEAK: + doPrepIF(ACQ_TYPE_WEAK, buff); doAcqWeak(request.sv, request.mindopp, request.maxdopp); break; default: @@ -642,7 +642,6 @@ void Acquisition::Import() int32 ms; int32 ms_per_read; int32 lcv; - ms_packet *p = NULL; timespec ret; ret.tv_sec = 0; @@ -654,13 +653,13 @@ void Acquisition::Import() switch(request.type) { - case ACQ_STRONG: + case ACQ_TYPE_STRONG: ms_per_read = 1; break; - case ACQ_MEDIUM: + case ACQ_TYPE_MEDIUM: ms_per_read = 10; break; - case ACQ_WEAK: + case ACQ_TYPE_WEAK: ms_per_read = 310; break; default: @@ -677,7 +676,7 @@ void Acquisition::Import() last = packet.count; /* Read a packet in */ - read(COR_2_ACQ_P[READ], p, sizeof(ms_packet)); + read(COR_2_ACQ_P[READ], &packet, sizeof(ms_packet)); memcpy(&buff[SAMPS_MS*ms], &packet.data, SAMPS_MS*sizeof(CPX)); objects/acquisition.cpp @@ -29,6 +29,7 @@ #define ACQUISITION_H_ #include "includes.h" +#include "sv_select.h" //#include "channel.h" #include "fifo.h" #include "fft.h" objects/acquisition.h @@ -31,6 +31,14 @@ #include "includes.h" #include "fft.h" +enum Channel_State +{ + CHANNEL_EMPTY, //!< Channel inactive + CHANNEL_FINE_ACQUIRE, //!< Channel is in open loop gathering correlations for fine frequency estimate + CHANNEL_BIT_LOCK, //!< Channel is trying to achieve bit lock + CHANNEL_NORMAL //!< Channel is tracking normally (post bit lock) +}; + #define FREQ_LOCK_POINTS (512) /*! \ingroup CLASSES @@ -153,6 +161,7 @@ class Channel : public Threaded_Object float getCN0(){return(cn0);}; float getNCO(){return(carrier_nco);}; int32 getActive(){return(active);}; + int32 getState(){return(state);}; void setActive(int32 _active){active = _active;}; int32 getSV(){return(sv);}; }; objects/channel.h @@ -139,13 +139,13 @@ void Correlator::Import() switch(result.type) { - case ACQ_STRONG: + case ACQ_TYPE_STRONG: aChannel[chan]->Start(result.sv, result, 1); break; - case ACQ_MEDIUM: + case ACQ_TYPE_MEDIUM: aChannel[chan]->Start(result.sv, result, 10); break; - case ACQ_WEAK: + case ACQ_TYPE_WEAK: aChannel[chan]->Start(result.sv, result, 10); break; } @@ -161,9 +161,6 @@ void Correlator::Import() packet_count++; - if((packet_count % 1000) == 0) - printf("Packets %d\n",packet_count); - } /*----------------------------------------------------------------------------------------------*/ @@ -171,18 +168,18 @@ void Correlator::Import() /*----------------------------------------------------------------------------------------------*/ void Correlator::Correlate() { - int32 lcv, leftover, rollover; + int32 lcv, leftover; + CPX *if_data; + NCO_Command_S *f; Correlation_S *c; Correlator_State_S *s; - NCO_Command_S *f; - Measurement_M *m; - Measurement_M *mb; - CPX *if_data; IncStartTic(); - // if(packet.measurement) - // TakeMeasurement(); + if((packet_count % MEASUREMENT_INT) == 0) + { + TakeMeasurements(); + } for(lcv = 0; lcv < MAX_CHANNELS; lcv++) { @@ -265,50 +262,78 @@ void Correlator::Correlate() /*----------------------------------------------------------------------------------------------*/ -void Correlator::TakeMeasurement(Correlator_State_S *s, Measurement_M *m, Measurement_M *mb) +void Correlator::TakeMeasurements() { int32 lcv, tic; int32 n_dp, n_p, n_c; + Correlator_State_S *s; Measurement_M *pmeas; + Measurement_M *m; + Measurement_M *mb; - tic = packet.measurement; - - /* Step 1, copy in measurement from ICP_TICS ago */ - memcpy(m, &mb[(tic - ICP_TICS + TICS_PER_SECOND) % TICS_PER_SECOND], sizeof(Measurement_M)); - - /* Get carrier phase prev from 2*ICP_TICKS ago */ - m->carrier_phase_prev = mb[(tic - 2*ICP_TICS + TICS_PER_SECOND) % TICS_PER_SECOND].carrier_phase; + measurement_tic++; + tic = measurement_tic; - /* Get current carrier phase */ - m->carrier_phase = s->carrier_phase; + printf("Packet count: %d\n",packet_count); - /* Store rest of measurement in buffer to do the delay */ - pmeas = &mb[tic % (TICS_PER_SECOND)]; - //pmeas->chan = chan; -// pmeas->code_phase = s->code_phase; -// pmeas->code_phase_mod = s->code_phase_mod; -// pmeas->carrier_phase = s->carrier_phase; -// pmeas->carrier_phase_mod = s->carrier_phase_mod; -// pmeas->code_nco = s->code_nco; -// pmeas->carrier_nco = s->carrier_nco; -// pmeas->_1ms_epoch = s->_1ms_epoch; -// pmeas->_20ms_epoch = s->_20ms_epoch; -// pmeas->_z_count = s->_z_count; -// pmeas->sv = s->sv; -// pmeas->count = packet.count; -// pmeas->navigate = s->navigate; + for(lcv = 0; lcv < MAX_CHANNELS; lcv++) + { - n_dp = mb[(tic - 2*ICP_TICS + TICS_PER_SECOND) % TICS_PER_SECOND].navigate; - n_p = mb[(tic - ICP_TICS + TICS_PER_SECOND) % TICS_PER_SECOND].navigate; - n_c = mb[tic % TICS_PER_SECOND].navigate; + s = &states[lcv]; + m = &measurements[lcv]; + mb = measurements_buff[lcv]; - /* Mark navigate only if all 3 are navigate */ - m->navigate = n_dp && n_p && n_c; + if(s->navigate) + { + /* Step 1, copy in measurement from ICP_TICS ago */ + memcpy(m, &mb[(tic - ICP_TICS + MEASUREMENTS_PER_SECOND) % MEASUREMENTS_PER_SECOND], sizeof(Measurement_M)); + + /* Step 2, Get carrier phase prev from 2*ICP_TICKS ago */ + m->frac_carrier_phase_prev = mb[(tic - 2*ICP_TICS + MEASUREMENTS_PER_SECOND) % MEASUREMENTS_PER_SECOND].frac_carrier_phase; + m->carrier_phase_prev = mb[(tic - 2*ICP_TICS + MEASUREMENTS_PER_SECOND) % MEASUREMENTS_PER_SECOND].carrier_phase; + + /* Step 3, store rest of measurement in buffer to do the delay */ + pmeas = &mb[tic % (MEASUREMENTS_PER_SECOND)]; + pmeas->chan = lcv; + pmeas->tic = tic; + pmeas->sv = s->sv; + pmeas->power = 0; + pmeas->antenna = 0; + pmeas->subframe_sec = s->_z_count; + pmeas->_1ms_epoch = s->_1ms_epoch; + pmeas->_20ms_epoch = s->_20ms_epoch; + + /* All these values need scaled!!! */ + pmeas->code_rate = s->code_nco; + pmeas->code_phase = s->code_phase; + pmeas->frac_code_phase = s->code_phase_mod; + pmeas->carrier_rate = s->carrier_nco; + pmeas->frac_carrier_phase = s->carrier_phase_mod; + pmeas->carrier_phase = s->carrier_phase; + + /* Step 4, Get current carrier phase to finish ICP measurement */ + m->carrier_phase = pmeas->carrier_phase; + m->frac_carrier_phase = pmeas->frac_carrier_phase; + + n_dp = mb[(tic - 2*ICP_TICS + MEASUREMENTS_PER_SECOND) % MEASUREMENTS_PER_SECOND].navigate; + n_p = mb[(tic - ICP_TICS + MEASUREMENTS_PER_SECOND) % MEASUREMENTS_PER_SECOND].navigate; + n_c = mb[tic % MEASUREMENTS_PER_SECOND].navigate; + + /* Mark navigate only if all 3 are navigate */ + m->navigate = n_dp && n_p && n_c; + } + else + { + pmeas->navigate = false; + m->navigate = false; + } - /* Write over measurement */ - //write(Corr_2_PVT_P[chan][WRITE], m, sizeof(Measurement_M)); + } + /* Write the preamble, then the measurements */ + write(ISRP_2_PVT_P[WRITE], &preamble, sizeof(Preamble_2_PVT_S)); + write(ISRM_2_PVT_P[WRITE], &measurements, MAX_CHANNELS*sizeof(Measurement_M)); } /*----------------------------------------------------------------------------------------------*/ objects/correlator.cpp @@ -29,6 +29,7 @@ #define CORRELATOR_H_ #include "includes.h" +#include "sv_select.h" #include "channel.h" #include "fifo.h" @@ -46,12 +47,14 @@ class Correlator : public Threaded_Object Correlation_S correlations[MAX_CHANNELS]; //!< Resulting correlation Correlator_State_S states[MAX_CHANNELS]; //!< Correlator states Measurement_M measurements[MAX_CHANNELS]; //!< Measurements to dump - Measurement_M meas_buff[MAX_CHANNELS][TICS_PER_SECOND]; //!< Measurements to dump + Measurement_M measurements_buff[MAX_CHANNELS][MEASUREMENTS_PER_SECOND]; //!< Measurements to dump + Preamble_2_PVT_S preamble; /* These variables are shared among all the channels */ Acq_Command_S result; //!< An acquisition result has been returned! ms_packet packet; //!< 1ms of data int32 packet_count; //!< Count 1ms packets + int32 measurement_tic; //!< Measurement tic CPX *main_sine_table; //!< Hold the sine wipeoff table CPX **main_sine_rows; //!< Row pointers to above MIX *main_code_table; //!< Hold the PRN lookup table for all 32 SVs [2*CODE_BINS+1][2*SAMPS_MS]; @@ -75,9 +78,9 @@ class Correlator : public Threaded_Object void UpdateState(Correlator_State_S *s, int32 samps); //!< Update correlator state void ProcessFeedback(Correlator_State_S *s, NCO_Command_S *f); //!< Process the feedback void DumpAccum(Correlator_State_S *s, Correlation_S *c, NCO_Command_S *f); //!< Dump accumulation to channel for processing - void TakeMeasurement(Correlator_State_S *s, Measurement_M *m, Measurement_M *mb); //!< Take some measurements - void Accum(Correlator_State_S *s, Correlation_S *c, CPX *data, int32 samps); //!< Do the actual accumulation - void SineGen(int32 samps); //!< Dynamic wipeoff generation + void TakeMeasurements(); //!< Take some measurements + void Accum(Correlator_State_S *s, Correlation_S *c, CPX *data, int32 samps); //!< Do the actual accumulation + void SineGen(int32 samps); //!< Dynamic wipeoff generation }; #endif /* CORRELATOR_H_ */ objects/correlator.h @@ -175,7 +175,6 @@ void FIFO::Import() IncStopTic(); - /* Resample? */ count++; } /*----------------------------------------------------------------------------------------------*/ @@ -185,9 +184,6 @@ void FIFO::Import() void FIFO::Enqueue() { - int32 lcv; - ms_packet *p; - sem_wait(&sem_empty); memcpy(&head->data[0], &if_buff[0], SAMPS_MS*sizeof(CPX)); @@ -196,8 +192,6 @@ void FIFO::Enqueue() sem_post(&sem_full); - Unlock(); - } /*----------------------------------------------------------------------------------------------*/ @@ -206,9 +200,6 @@ void FIFO::Enqueue() void FIFO::Dequeue(ms_packet *p) { - if(tail->next != head) - tail = tail->next; - sem_wait(&sem_full); memcpy(p, tail, sizeof(ms_packet)); objects/fifo.cpp @@ -28,7 +28,7 @@ #include "threaded_object.h" /*----------------------------------------------------------------------------------------------*/ -Threaded_Object::Threaded_Object(char _task_name[8]) +Threaded_Object::Threaded_Object(const char _task_name[8]) { int32 lcv; @@ -221,6 +221,7 @@ void *Threaded_Object::getObjectMem() void Threaded_Object::IncExecTic() { execution_tic++; +// printf("%s: %d\n",task_name,execution_tic); } /*----------------------------------------------------------------------------------------------*/ objects/threaded_object.cpp @@ -69,7 +69,7 @@ class Threaded_Object public: /* Default object methods */ - Threaded_Object(char _task_name[8]);//!< Constructor + Threaded_Object(const char _task_name[8]);//!< Constructor ~Threaded_Object(); //!< Destructor void Lock(); //!< Lock the object's mutex objects/threaded_object.h Debug/accessories/subdir.mk Debug/acquisition/subdir.mk Debug/gui/subdir.mk Debug/main/subdir.mk Debug/makefile Debug/newgui/subdir.mk Debug/objects.mk Debug/objects/subdir.mk Debug/simd/subdir.mk Debug/sources.mk Debug/subdir.mk Debug/usrp/db_dbs_rx.d Debug/usrp/subdir.mk f9d53812c0f200266e28c8d6317fdbece9664aa2 Gregory W Heckler gheckler@mesa3081994.(none) http://github.com/gps-sdr/gps-sdr/commit/5b767dbe4fcaa31453614bba64912c36cc94f29a 5b767dbe4fcaa31453614bba64912c36cc94f29a 2009-05-07T15:02:37-07:00 2009-05-07T15:02:37-07:00 Near a working version. 8fbdeb738a5811e73d507aac587470c2c5f2e54c Gregory W Heckler gheckler@mesa3081994.(none)