From 64461bf14f8ce1a01d420a01f1cf056f13b7385b Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Fri, 27 Nov 2009 12:13:33 +0000 Subject: [PATCH 1/1] add 500khz band and CTY-1923 prefixes --- Changes | 3 +++ cmd/show/bands.pl | 2 +- data/bands.pl | 5 ++++- data/cty.dat | 21 +++++++++++---------- data/prefix_data.pl | 10 ++++++++-- perl/Version.pm | 2 +- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/Changes b/Changes index a7d6a81c..252d316d 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +27Nov09======================================================================= +1. Add 500khz band as suggested by Béla, HA5DI. +2. Add CTY-1923 prefixes 25Nov09======================================================================= 1. Change sh/qrz to use the xml interface. You will have to subscribe to the xml interface - see http://www.qrz.com/XML/index.html for more info. diff --git a/cmd/show/bands.pl b/cmd/show/bands.pl index 67b0cb5e..7841764a 100644 --- a/cmd/show/bands.pl +++ b/cmd/show/bands.pl @@ -6,7 +6,7 @@ # # -$DB::single = 1; +#DB::single = 1; my ($self, $line) = @_; my @f = split /\s+/, $line; diff --git a/data/bands.pl b/data/bands.pl index dad639e2..464b5805 100644 --- a/data/bands.pl +++ b/data/bands.pl @@ -22,6 +22,9 @@ '136khz' => bless ( { band => [135, 138], }, 'Bands'), + '500khz' => bless ( { band => [493, 525], + }, 'Bands'), + '160m' => bless( { band => [ 1800, 2000 ], cw => [ 1800, 1830 ], rtty => [ 1838, 1841 ], @@ -195,7 +198,7 @@ # %regions = ( - vlf => [qw( 73khz 136khz )], + vlf => [qw( 73khz 136khz 500khz )], hf => [qw( 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m )], contesthf => [qw( 160m 80m 40m 20m 15m 10m )], vhf => [qw( 6m 4m 2m 220 )], diff --git a/data/cty.dat b/data/cty.dat index 4e40c856..4b945a3b 100644 --- a/data/cty.dat +++ b/data/cty.dat @@ -53,7 +53,7 @@ Israel: 20: 39: AS: 31.80: -35.20: -2.0: 4X: Libya: 34: 38: AF: 32.50: -12.50: -2.0: 5A: 5A; Cyprus: 20: 39: AS: 35.20: -33.40: -2.0: 5B: - 5B,C4,H2,P3; + 5B,C4,H2,P3,=VERSION; Tanzania: 37: 53: AF: -7.00: -39.50: -3.0: 5H: 5H,5I; Nigeria: 35: 46: AF: 6.50: -3.40: -1.0: 5N: @@ -163,7 +163,8 @@ China: 24: 44: AS: 40.00: -116.40: -8.0: BY: BY3L(23)[33],BY9M(24)[33],BY9N(24)[33],BY9O(24)[33],BY9P(24)[33],BY9Q(24)[33], BY9R(24)[33],BY9S(24)[33],BZ,BZ3G(23)[33],BZ3H(23)[33],BZ3I(23)[33], BZ3J(23)[33],BZ3K(23)[33],BZ3L(23)[33],BZ9M(24)[33],BZ9N(24)[33], - BZ9O(24)[33],BZ9P(24)[33],BZ9Q(24)[33],BZ9R(24)[33],BZ9S(24)[33],XS; + BZ9O(24)[33],BZ9P(24)[33],BZ9Q(24)[33],BZ9R(24)[33],BZ9S(24)[33],XS, + =VE7AF/BY7KH; Nauru: 31: 65: OC: -0.50: -166.90: -12.0: C2: C2; Andorra: 14: 27: EU: 42.50: -1.50: -1.0: C3: @@ -214,7 +215,7 @@ Angola: 36: 52: AF: -12.50: -18.50: -1.0: D2: Cape Verde: 35: 46: AF: 16.00: 24.00: 1.0: D4: D4; Comoros: 39: 53: AF: -11.80: -43.70: -3.0: D6: - D6,=VERSION; + D6; Germany: 14: 28: EU: 51.00: -10.00: -1.0: DL: DA,DB,DC,DD,DE,DF,DG,DH,DI,DJ,DK,DL,DM,DN,DO,DP,DQ,DR; Philippines: 27: 50: OC: 13.00: -122.00: -8.0: DU: @@ -269,7 +270,7 @@ Mayotte: 39: 53: AF: -13.00: -45.30: -3.0: FH: St. Barthelemy: 08: 11: NA: 17.90: 62.90: 4.0: FJ: FJ; New Caledonia: 32: 56: OC: -21.50: -165.50: -11.0: FK: - FK,TX8; + FK,TX8,=TX1B; Chesterfield Islands: 30: 56: OC: -19.90: -158.30: -11.0: FK/c: =TX3A; Martinique: 08: 11: NA: 14.60: 61.00: 4.0: FM: @@ -741,11 +742,11 @@ Benin: 35: 46: AF: 6.50: -2.60: -1.0: TY: Mali: 35: 46: AF: 12.70: 8.00: 0.0: TZ: TZ; European Russia: 16: 29: EU: 55.80: -37.60: -3.0: UA: - R,RD1N[19],RD1O[19],RD1Z[19],RD4W[30],RK1N[19],RK1O[19],RK1Z[19],RK4W[30], - RM1N[19],RM1O[19],RM1Z[19],RM4W[30],RN1N[19],RN1O[19],RN1Z[19],RN4W[30], - RU1N[19],RU1O[19],RU1Z[19],RU4W[30],RV1N[19],RV1O[19],RV1Z[19],RV4W[30], - RW1N[19],RW1O[19],RW1Z[19],RW4W[30],U,UA1N[19],UA1O[19],UA1Z[19],UA4W[30], - =R7C,=R7C/1,=R7C/3,=R7C/4; + R,RA1N[19],RA1O[19],RA1Z[19],RA4W[30],RD1N[19],RD1O[19],RD1Z[19],RD4W[30], + RK1N[19],RK1O[19],RK1Z[19],RK4W[30],RM1N[19],RM1O[19],RM1Z[19],RM4W[30], + RN1N[19],RN1O[19],RN1Z[19],RN4W[30],RU1N[19],RU1O[19],RU1Z[19],RU4W[30], + RV1N[19],RV1O[19],RV1Z[19],RV4W[30],RW1N[19],RW1O[19],RW1Z[19],RW4W[30],U, + UA1N[19],UA1O[19],UA1Z[19],UA4W[30],=R7C,=R7C/1,=R7C/3,=R7C/4; Kaliningrad: 15: 29: EU: 55.00: -20.50: -2.0: UA2: R2,RA2,RB2,RC2,RD2,RE2,RF2,RG2,RH2,RI2,RJ2,RK2,RL2,RM2,RN2,RO2,RP2,RQ2, RR2,RS2,RT2,RU2,RV2,RW2,RX2,RY2,RZ2,U2,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2, @@ -842,7 +843,7 @@ Canada: 05: 09: NA: 45.00: 80.00: 4.0: VE: =VE2PR(2),=VE2QRZ(2),=VE2RB(2),=VE2TVU(2),=VE2UA(2),=VE2VH(2),=VE2WDX(2), =VE2WT(2),=VE2XAA/2(2),=VE2XY(2),=VE2YM(2),=VE2Z(2),=VE2ZC(5),=VE2ZM(5), =VE2ZV(5),=VE3EY/2(2),=VE3NE/2(2),=VE3RHJ/2(2),=VE8AJ(2),=VE8PW(2), - =VE8RCS(2),=VER20091124,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4], + =VE8RCS(2),=VER20091126,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4], =XM3NE/2(2); Australia: 30: 59: OC: -22.00: -135.00: -10.0: VK: AX,VH,VI,VJ,VK,VL,VM,VN,VZ; diff --git a/data/prefix_data.pl b/data/prefix_data.pl index 32a12ce6..a99671bf 100644 --- a/data/prefix_data.pl +++ b/data/prefix_data.pl @@ -1462,6 +1462,7 @@ '=TO8Z' => '46', '=TO9A' => '46', '=TO9T' => '43', + '=TX1B' => '45,318', '=TX3A' => '318', '=TX5C' => '48', '=TX5SPA' => '315', @@ -1538,11 +1539,12 @@ '=VE3EY/2' => '189,545,546,547,548,549,550,551,552,553', '=VE3NE/2' => '189,545,546,547,548,549,550,551,552,553', '=VE3RHJ/2' => '189,545,546,547,548,549,550,551,552,553', + '=VE7AF/BY7KH' => '10,341,342,343', '=VE8AJ' => '189,545,546,547,548,549,550,551,552,553', '=VE8PW' => '189,545,546,547,548,549,550,551,552,553', '=VE8RCS' => '189,545,546,547,548,549,550,551,552,553', - '=VER20091124' => '189,545,546,547,548,549,550,551,552,553', - '=VERSION' => '31', + '=VER20091126' => '189,545,546,547,548,549,550,551,552,553', + '=VERSION' => '266', '=VK0HI' => '192', '=VK0IR' => '192', '=VK9AA' => '332', @@ -3306,9 +3308,13 @@ 'R9W' => '174,525,530', 'RA0' => '522,524,528', 'RA1' => '518', + 'RA1N' => '171,518,519,520,521', + 'RA1O' => '171,518,519,520,521', + 'RA1Z' => '171,518,519,520,521', 'RA2' => '173', 'RA3' => '519', 'RA4' => '520', + 'RA4W' => '171,518,519,520,521', 'RA6' => '521', 'RA7' => '174,525,530', 'RA8' => '531', diff --git a/perl/Version.pm b/perl/Version.pm index ffa9ecd3..55bcb950 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,6 +11,6 @@ use vars qw($version $subversion $build); $version = '1.55'; $subversion = '0'; -$build = '54'; +$build = '55'; 1; -- 2.43.0