diff --git a/bookmarks.d/weather.json b/bookmarks.d/weather.json index 86f6203d..54f41ceb 100644 --- a/bookmarks.d/weather.json +++ b/bookmarks.d/weather.json @@ -1,83 +1,88 @@ [ + { + "name" : "DDH47", + "frequency" : 146300, + "modulation" : "rtty450" + }, + { + "name" : "DDH9", + "frequency" : 11038000, + "modulation" : "rtty450" + }, + { + "name" : "DDH8", + "frequency" : 14466300, + "modulation" : "rtty450" + }, + { + "name" : "DDK2", + "frequency" : 4582000, + "modulation" : "rtty450" + }, + { + "name" : "DDH7", + "frequency" : 7645000, + "modulation" : "rtty450" + }, + { + "name" : "DDK9", + "frequency" : 10099800, + "modulation" : "rtty450" + }, + { + "name" : "NAVTEX", + "frequency" : 489000, + "modulation" : "sitorb" + }, { "name" : "NAVTEX", "frequency" : 517000, "modulation" : "sitorb" }, - { - "name" : "SITOR-B", - "frequency" : 4209000, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 6313000, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 8415500, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 12578000, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 16805500, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 19679500, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 22375000, - "modulation" : "sitorb" - }, - { - "name" : "SITOR-B", - "frequency" : 26099500, - "modulation" : "sitorb" - }, { "name" : "NAVTEX", "frequency" : 4208500, "modulation" : "sitorb" }, { - "name" : "DDH47", - "frequency" : 147300, - "modulation" : "rtty450" + "name" : "MSI", + "frequency" : 4209000, + "modulation" : "sitorb" }, { - "name" : "DDH9", - "frequency" : 11039000, - "modulation" : "rtty450" + "name" : "MSI", + "frequency" : 6313000, + "modulation" : "sitorb" }, { - "name" : "DDH8", - "frequency" : 14467300, - "modulation" : "rtty450" + "name" : "MSI", + "frequency" : 8415500, + "modulation" : "sitorb" }, { - "name" : "DDK2", - "frequency" : 4583000, - "modulation" : "rtty450" + "name" : "MSI", + "frequency" : 12578000, + "modulation" : "sitorb" }, { - "name" : "DDH7", - "frequency" : 7646000, - "modulation" : "rtty450" + "name" : "MSI", + "frequency" : 16805500, + "modulation" : "sitorb" }, { - "name" : "DDK9", - "frequency" : 10100800, - "modulation" : "rtty450" + "name" : "MSI", + "frequency" : 19679500, + "modulation" : "sitorb" + }, + { + "name" : "MSI", + "frequency" : 22375000, + "modulation" : "sitorb" + }, + { + "name" : "MSI", + "frequency" : 26099500, + "modulation" : "sitorb" }, { "name" : "NOAA-1", diff --git a/bookmarks.txt b/bookmarks.txt index 56325a2d..a5eb9f51 100644 --- a/bookmarks.txt +++ b/bookmarks.txt @@ -46,6 +46,21 @@ DDK2|||4583|RTTY450 DDH7|||7646|RTTY450 DDK9|||10100.8|RTTY450 +# +# Weather NAVTEX / SITOR-B stations +# +NAVTEX|||490|SITORB +NAVTEX|||518|SITORB +NAVTEX|||4209.5|SITORB +MSI|||4210|SITORB +MSI|||6314|SITORB +MSI|||8416.5|SITORB +MSI|||12579|SITORB +MSI|||16806.5|SITORB +MSI|||19680.5|SITORB +MSI|||22376|SITORB +MSI|||26100.5|SITORB + # # NOAA weather broadcasts # diff --git a/makebookmarks.pl b/makebookmarks.pl index 496f3402..55f10a1c 100755 --- a/makebookmarks.pl +++ b/makebookmarks.pl @@ -32,7 +32,15 @@ while() if($First) { $First=0; } else { printf(",\n"); } # Set FAX frequencies 1.9kHz lower than the carrier - if(lc($Mod) eq "fax") { $Freq -= 1.9; } + if(lc($Mod) eq "fax") { $Freq -= 1.9; } + # Set RTTY frequencies 1kHz lower than the left carrier + if(lc($Mod) eq "rtty450") { $Freq -= 1.0; } + if(lc($Mod) eq "rtty170") { $Freq -= 1.0; } + if(lc($Mod) eq "rtty85") { $Freq -= 1.0; } + # Set NAVTEX/SITOR-B frequencies 1kHz lower than the left carrier + if(lc($Mod) eq "sitorb") { $Freq -= 1.0; } + # Set CW frequencies 800Hz lower than the carrier + if(lc($Mod) eq "cw") { $Freq -= 0.8; } printf(" {\n"); printf(" \"name\" : \"%s\",\n", $Name);