X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=data%2Fbands.pl;h=958c3bae6f3b10e1f053ba262ca9d55b83306a70;hb=37a9324302cb4de2c25ce0005d697fd9895ea8cd;hp=9c9d6cafb05f52e975b3fe39e724f69a6475b59f;hpb=db899e80960be24e47a415951a90c8b48d758b51;p=spider.git

diff --git a/data/bands.pl b/data/bands.pl
index 9c9d6caf..958c3bae 100644
--- a/data/bands.pl
+++ b/data/bands.pl
@@ -12,6 +12,14 @@
 # It is up to YOU to make sure that it makes sense!
 #
 # ALL the labels MUST BE in lower case.
+#
+# Band names change (or I got them wrong in the first place), DO NOT CHANGE THE BAND NAMES
+# THAT I USED. If you do then expect to get complaints. Instead just alias then just alias
+# them to what you think they should be.
+#
+# WARNING: if aliasing, the band alias must be declared AFTER the original.
+#
+# See '550khz' and '630m' as an exemplar.
 # 
 
 
@@ -22,29 +30,33 @@
 		  '136khz' => bless ( { band => [135, 138],
 							  }, 'Bands'),
 
+		  '500khz' => bless ( { band => [472, 479],
+							  }, 'Bands'),
+
 		  '160m' => bless( { band => [ 1800, 2000 ], 
-							 cw => [ 1800, 1830 ], 
-							 rtty => [ 1838, 1841 ], 
+							 cw => [ 1800, 1840 ], 
+							 rtty => [ 1838, 1841 ],
+							 data => [ 1838, 1843],
 							 ssb => [ 1831, 2000] 
 						   }, 'Bands'),
 
 		  '80m' => bless( { band => [ 3500, 4000 ], 
 							cw => [ 3500, 3600 ], 
-							data => [ 3580, 3619 ], 
+							data => [ 3570, 3619 ], 
 							rtty => [ 3580, 3619 ], 
 							sstv => [ 3730, 3740 ], 
 							ssb => [ 3601, 4000 ]  
 						  }, 'Bands'),
 
-		  '60m' => bless( { band => [ 5258, 5407], 
-				
+		  '60m' => bless( { band => [ 5100, 5410],
+							ssb => [5300, 5410],
 				}, 'Bands' ),
 
-		  '40m' => bless( { band => [ 7000, 7400 ], 
-							cw => [ 7000, 7034 ], 
-							data => [ 7035, 7044], 
-							rtty => [ 7035, 7044], 
-							ssb => [ 7051, 7400 ] 
+		  '40m' => bless( { band => [ 7000, 7300 ], 
+							cw => [ 7000, 7040 ],
+							data => [ 7040, 7100],
+							rtty => [ 7040, 7060],
+							ssb => [ 7050, 7300 ]
 						  }, 'Bands'),
 
 		  '30m' => bless( { band => [ 10100, 10150 ], 
@@ -98,7 +110,7 @@
 						   ssb => [50100, 50500],
 						 }, 'Bands'),
 
-		  '4m' => bless( { band => [70000, 70500],
+		  '4m' => bless( { band => [70000, 70631],
 						   cw => [70030, 70250],
 						   ssb => [70030, 70250],
 						 }, 'Bands'),
@@ -151,6 +163,19 @@
 							ssb => [47087000, 47089000],
 						  }, 'Bands'),
 
+		  '4mm' => bless( { band => [75500000, 81000000], 
+						  }, 'Bands'), 
+
+		  '122g' => bless( { band => [122250000, 123000000], 
+						  }, 'Bands'), 
+
+		  '134g' => bless( { band => [134000000, 141000000],
+						   }, 'Bands'),
+
+		  '248g' => bless( { band => [241000000, 250000000], 
+						  }, 'Bands'), 
+
+		  
 		  'band1' => bless ( { band => [47000, 49999, 52000, 68000],
 							 }, 'Bands'),
 		      
@@ -183,8 +208,21 @@
 
 		  'pmruhf' => bless ( { band => [425000, 430000, 440000, 471000],
 							  }, 'Bands'),
+		   hf => bless ( { band => [1800, 29999], }, 'Bands'), 
+		   vhf => bless ( { band => [30000, 299999], }, 'Bands'), 
 		 );
 
+#
+# fix up some aliases
+#
+
+$bands{'630m'} => $bands{'500khz'};
+$bands{'24g'} => $bands{'12mm'};
+$bands{'47g'} => $bands{'6mm'};
+$bands{'76g'} => $bands{'4mm'};
+
+
+
 #
 # the list of regions
 #
@@ -195,8 +233,9 @@
 #
 
 %regions = (
-			vlf => [qw( 73khz 136khz )],
-			hf => [qw( 160m 80m 40m 30m 20m 17m 15m 12m 10m )],
+			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 )],
 			vhfradio => [qw( band1 band2 )],
 			vhftv => [qw( band1 band3 )],
@@ -205,6 +244,7 @@
 			shf => [qw( 23cm 13cm 9cm 6cm 3cm )],
 			pmr => [qw( pmrlow pmrmid pmrhigh pmruhf )],
 			spe => [qw( 10m 6m 4m 2m )],
-			all => [qw( 73khz 136khz 160m 80m 40m 30m 20m 17m 15m 12m 10m 6m 4m 2m 220 70cm 23cm 9cm 6cm 3cm 12mm 6mm )],
+			warc => [qw( 60m 30m 17m 12m )],
+			all => [qw( 73khz 136khz 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m 6m 4m 2m 220 70cm 23cm 9cm 6cm 3cm 12mm 6mm )],
 		   );