my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
- return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$hops^~", $freq, cldate($t), ztime($t);
+ return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
}
# create an announce message
sub pc18
{
my $info = DXCluster::cluster;
- return "PC18^$info^$DXProt::myprot_version^~";
+ return "PC18^$info^$DXProt::myprot_version^";
}
#
return "PC24^$call^$flag^$hops^";
}
+
+# create a merged dx message (freq, dxcall, t, text, spotter, orig-node)
+sub pc26
+{
+ my ($freq, $dxcall, $t, $text, $spotter, $orignode) = @_;
+ $text = ' ' unless $text;
+ $orignode = $main::mycall unless $orignode;
+ return sprintf "PC26^%.1f^$dxcall^%s^%s^$text^$spotter^$orignode^ ^~", $freq, cldate($t), ztime($t);
+}
+
+# create a merged WWV spot (logger, t, sfi, a, k, forecast, orig-node)
+sub pc27
+{
+ my ($logger, $t, $sfi, $a, $k, $forecast, $orignode) = @_;
+ return sprintf "PC27^%s^%-2.2s^$sfi^$a^$k^$forecast^$logger^$orignode^ ^~", cldate($t), ztime($t);
+}
+
# message start (fromnode, tonode, to, from, t, private, subject, origin)
sub pc28
{
sub pc29
{
my ($fromnode, $tonode, $stream, $text) = @_;
- $text =~ s/\^//og; # remove ^
+ $text =~ s/\^/:/og; # remove ^
+# $text =~ s/\~/S/og;
return "PC29^$fromnode^$tonode^$stream^$text^~";
}
# send all the DX clusters I reckon are connected
sub pc38
{
- my @list = DXNode->get_all();
- my $list;
- my @nodes;
-
- foreach $list (@list) {
- push @nodes, $list->call;
- }
+ my @nodes = map { ($_->dxchan && $_->dxchan->isolate) ? () : $_->call } DXNode->get_all();
return "PC38^" . join(',', @nodes) . "^~";
}
return "PC42^$fromnode^$tonode^$stream^";
}
+# remote db request
+sub pc44
+{
+ my ($fromnode, $tonode, $stream, $db, $req, $call) = @_;
+ $db = uc $db;
+ return "PC44^$tonode^$fromnode^$stream^$db^$req^$call^";
+}
+
+# remote db data
+sub pc45
+{
+ my ($fromnode, $tonode, $stream, $data) = @_;
+ return "PC45^$tonode^$fromnode^$stream^$data^";
+}
+
+# remote db data complete
+sub pc46
+{
+ my ($fromnode, $tonode, $stream) = @_;
+ return "PC46^$tonode^$fromnode^$stream^";
+}
+
# bull delete
sub pc49
{