mv HTTPMsg to AsyncMsg, add 'raw' method

[spider.git] / cmd / show / muf.pl

diff --git a/cmd/show/muf.pl b/cmd/show/muf.pl
index 5487ea0d1602f3ffd174d17be3d1424285dda6bd..3c01944bb1e861714a910040b63ced9a1a90eddc 100644 (file)
--- a/cmd/show/muf.pl
+++ b/cmd/show/muf.pl
@@ -6,8 +6,10 @@
 #
 # as fixed by Steve Franke K9AN
 #
-# $Id$
 #
+#
+
+use Minimuf;
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
@@ -36,10 +38,13 @@ my ($d, $b1, $b2);                          # distance, bearing from TX and from RX
 my ($lat2, $lon2);              # lats and longs in radians
 my $lat1 = $self->user->lat;
 my $lon1 = $self->user->long;
+my $loc1 = $self->user->qth || "unknown";
+
 if (!$lon1 && !$lat1) {
        push @out, $self->msg('heade1');
        $lat1 = $main::mylatitude;
        $lon1 = $main::mylongitude;
+       $loc1 = $main::myqth;
 }
 $lat2 = $a->{lat};
 $lon2 = $a->{long};
@@ -76,7 +81,7 @@ $theta=$theta+2.*$pi if( $theta <= -$pi);
 $theta=$theta-2.*$pi if( $theta >= $pi);
 
 my ($lats, $lons);                             # subsolar coordinates (rad) 
-my $dB1 = 20;                                  # transmitter output power (dBW) 
+my $dB1 = 26;                                  # transmitter output power (dBW) 
 
 my $delay;                                             # path delay (ms) 
 my $psi;                                               # sun zenith angle (rad) 
@@ -90,7 +95,7 @@ my $beta1;                                            # elevation angle (rad)
 my $dhop;                                              # hop great-circle distance (rad) 
 my $height;                                            # height of F layer (km) 
 my $time;                                              # time of day (hour) 
-my $rsens = -123;                              # RX sensitivity
+my $rsens = -128;                              # RX sensitivity
 
 
 my @freq = qw(1.8 3.5 7.0 10.1 14.0 18.1 21.0 24.9 28.0 50.0); # working frequencies (MHz) 
@@ -116,10 +121,10 @@ $phiF = atan($ftemp / sqrt(1 - $ftemp * $ftemp));
 $delay = ((2 * $hop * sin($dhop) * ($R + $hF)) / cos($beta1) / $VOFL) * 1e6;
 
 # print summary of data so far
-push @out, sprintf("RxSens: $rsens dBM SFI:%4.0lf   R:%4.0lf   Month: $month   Day: $day", $flux, $ssn);
+push @out, sprintf("RxSens: $rsens dBM SFI:%4.0f   R:%4.0f   Month: $month   Day: $day", $flux, $ssn);
 push @out, sprintf("Power :  %3.0f dBW    Distance:%6.0f km    Delay:%5.1f ms", $dB1, $d * $R, $delay);
 push @out, sprintf("Location                       Lat / Long           Azim");
-push @out, sprintf("%-30.30s %-18s    %3.0f", $main::myqth, DXBearing::lltos($lat1*$r2d, -$lon1*$r2d), $b1 * $r2d);
+push @out, sprintf("%-30.30s %-18s    %3.0f", $loc1, DXBearing::lltos($lat1*$r2d, -$lon1*$r2d), $b1 * $r2d);
 push @out, sprintf("%-30.30s %-18s    %3.0f", $a->name, DXBearing::lltos($lat2*$r2d, -$lon2*$r2d), $b2 * $r2d);
 my $head = "UT LT  MUF Zen";
 for ($i = 0; $i < $nfreq; $i++) {