Added in a #define in config.h (MAX_ACQS_PER_PVT) to control speed of…

… acquisition. Made sure usage output in init.cpp is correct.
doyke · Jul 27, 2009 · 51b78da · 51b78da
1 parent 1928a4b
commit 51b78da
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/includes/config.h b/includes/config.h
@@ -34,7 +34,7 @@
 /*----------------------------------------------------------------------------------------------*/
 #define SOFTWARE_VERSION_MAJOR		(2)
 #define SOFTWARE_VERSION_MINOR		(6)
-#define SOFTWARE_VERSION_POSTFIX	(1)
+#define SOFTWARE_VERSION_POSTFIX	(2)
 /*----------------------------------------------------------------------------------------------*/
 
 /* The most important thing, the NUMBER OF CORRELATORS IN THE RECEIVER and the NUMBER OF CPUs */
@@ -70,6 +70,7 @@
 /*----------------------------------------------------------------------------------------------*/
 #define MASK_ANGLE				(0)				//!< Add this many degrees to altitude dependant mask
 #define ACQ_MODULO_WEAK			(8)				//!< Do this many weak acqs per 32 PRN strong search
+#define MAX_ACQS_PER_PVT		(12)			//!< Max # of acquisitions per PVT
 #define MAX_DOPPLER_ABSOLUTE	(15000)			//!< Limit any and all Dopplers the be within this range
 #define MAX_DOPPLER_STRONG		(15000)			//!< Cold Doppler search space for strong signal
 #define MAX_DOPPLER_MEDIUM		(15000)			//!< Cold Doppler search space for strong signal

diff --git a/main/init.cpp b/main/init.cpp
@@ -48,7 +48,7 @@ void usage(char *_str)
 {
 	fprintf(stdout,"\n");
 	//fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-d] [-l] [-w] [-x] [-s]\n");
-	fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-w] [-x] [-s]\n");
+	fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-w] [-x] [-s] [-gn3s]\n");
 	fprintf(stdout,"[-c] log high rate channel data\n");
 	fprintf(stdout,"[-v] be verbose \n");
 	fprintf(stdout,"[-gr] <gain> set rf gain in dB (DBSRX only)\n");

diff --git a/objects/sv_select.cpp b/objects/sv_select.cpp
@@ -133,8 +133,7 @@ void SV_Select::Import()
 			nsvs++;
 
 	/* Slow down acquisition if PVT is doing fine */
-	acqs_per_pvt = MAX_CHANNELS - nsvs;
-	acqs_per_pvt = 1;
+	acqs_per_pvt = MAX_ACQS_PER_PVT - nsvs;
 
 	if(acqs_per_pvt < 1)
 		acqs_per_pvt = 1;