X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FRBN.pm;h=03efc0d380734b575eac63007196e40c7af0305b;hb=4eb47d73bc2221bde7a1dd761cef99e84b0bb388;hp=cfc082de685a99b676ca98d679d8544688c161ec;hpb=0201e23c75908ae1d5a6fd9321c999e78eb88f12;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index cfc082de..03efc0d3 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -301,7 +301,7 @@ sub normal
 		# process to just the standard "message passing" which has been shown to be able to sustain over 5000 
 		# per second (limited by the test program's output and network speed, rather than DXSpider's handling).
 
-		my $nqrg = nearest(1, $qrg);  # normalised to nearest Khz
+		my $nqrg = nearest(5, $qrg*10);  # normalised to nearest .5 Khz (but multipled by 10 to get an integer)
 #		my $nqrg = nearest_even($qrg);  # normalised to nearest Khz
 		my $sp = "$call|$nqrg";		  # hopefully the skimmers will be calibrated at least this well!
 		my $spp = sprintf("$call|%d", $nqrg+1); # but, clearly, my hopes are rudely dashed
@@ -513,7 +513,7 @@ sub dx_spot
 			dbg("RBN: STRENGTH spot: $s->[SCall] qrg: $s->[SQrg] origin: $s->[SOrigin] dB: $r->[RStrength] < $strength") if isdbg 'rbnll';
 		}
 
-		if ($rf) {
+		if ($rf && !$want) {
 			my ($want, undef) = $rf->it($s);
 			dbg("RBN: FILTERING for $call spot: $s->[SCall] qrg: $s->[SQrg] origin: $s->[SOrigin] dB: $r->[RStrength] com: '$s->[SComment]' want: " . ($want ? 'YES':'NO')) if isdbg 'rbnll';
 			next unless $want;