change the type of unit for spots

This is an attempt to see if we now get the correct no of spots / minute

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 93adf33233f69526bc9a8258c46b7b0b7f0f8952..0d027b9a39f7f66b97b9bbe796a3abd5cf1cbf2e 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -109,7 +109,7 @@ if ($want{totalusers} || $want{all}) {
 
 # do the total spots
 if ($want{totalspots} || $want{all}) {
-       $mc->cfgprint('totalspots',  [qw(unknaszero gauge noi)], 1000, 'Total Spots',
+       $mc->cfgprint('totalspots',  [qw(unknaszero absolute noi)], 1000, 'Total Spots',
                         'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
        $mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
        $Spot::totalspots = 0;
@@ -117,7 +117,7 @@ if ($want{totalspots} || $want{all}) {
 
 # do the HF and VHF spots
 if ($want{hfvhf} || $want{all}) {
-       $mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
+       $mc->cfgprint('hfspots', [qw(unknaszero absolute)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
                         'Spots / min', 'HF', 'VHF') unless $want{dataonly};
        $mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
        $Spot::hfspots = $Spot::vhfspots = 0;

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 1288165e33e51187c8c83cc740bf77cd645c48fa..9903ceb421c744d9b5642d843b7f1e9b99a0af1b 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -510,8 +510,8 @@ sub process
 
                # do the keepalive for me, if required
                if ($main::systime >= $main::me->{next_pc92_keepalive}) {
-                       $main::me->broadcast_pc92_keepalive($main::mycall);
                        time_out_pc92_routes();
+                       $main::me->broadcast_pc92_keepalive($main::mycall);
                }
 
                if ($pc92_slug_changes && $main::systime >= $last_pc92_slug + $pc92_slug_changes) {

diff --git a/perl/Version.pm b/perl/Version.pm
index d5140282b83ec48f9a0baa8aa2622edaec9b5515..d6880a32da3165708928205322692a576d96f21c 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '153';
+$build = '154';
 
 1;