Merge tag 'upstream/0+git20161227.ac7535a'

Upstream version 0+git20161227.ac7535a

3 files changed, 720 insertions, 410 deletions

diff --git a/atsc/ca-ON-Toronto b/atsc/ca-ON-Toronto
new file mode 100644
index 0000000..aa984e8
--- /dev/null
+++ b/atsc/ca-ON-Toronto
@@ -0,0 +1,200 @@
+#------------------------------------------------------------------------------
+# location			   : Toronto, ON, Canada
+# provider			   : OTA
+# date (yyyy-mm-dd)    : 2015-12-09
+# provided by (opt)    : maury.markowitz@gmail.com
+#------------------------------------------------------------------------------
+#
+# The following list are the main channels available in Toronto, including
+# both local channels as well as those from the US in the Buffalo area.
+# More distant stations like Rochester and Syracuse are listed below
+#
+#------------------------------------------------------------------------------
+# CFTO, Toronto CTV, physical channel 9, virtual channel 9, 17.4 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 9]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 189028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WUTV, Buffalo FOX, physical channel 14, virtual channel 29, 1000 kW, 981' tower, 43.025612 -78.928373
+[CHANNEL 14]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 473028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CHCH, Hamilton independent, physical channel 15, virtual channel 11, 132 kW, unknown tower, 43.207500 -79.774167
+[CHANNEL 15]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 479028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CICA, Toronto TVO, physical channel 19, virtual channel 19, 106.5 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 19]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 503028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CBLT, Toronto CBC, physical channel 20, virtual channel 5, 38 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 20]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 509028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CBLFT, Toronto CBC French, physical channel 25, virtual channel 25, 2.5 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 25]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 539028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WNLO, Buffalo CW, physical channel 32, virtual channel 23, 1000 kW, 994' tower, 43.030057 -78.920594
+[CHANNEL 32]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 581028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WGRZ, Buffalo NBC, physical channel 33, virtual channel 2, 480 kW, 968' tower, 42.718671 -78.562801
+[CHANNEL 33]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 587028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CHCJ, Hamilton CTV Two, physical channel 35, virtual channel 35, 390 kW, unknown tower, 43.231667 -79.859167
+[CHANNEL 35]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 599028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CITS, Hamilton CTS, physical channel 36, virtual channel 36, 5 kW, unknown tower, 43.207500 -79.774167
+[CHANNEL 36]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 605028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WKBW, Buffalo ABC, physical channel 38, virtual channel 7, 358 kW, 1420' tower, 42.637505 -78.619719
+[CHANNEL 38]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 611028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WIVB, Buffalo CBS, physical channel 39, virtual channel 4, 790 kW, 1368' tower, 42.659227 -78.625581
+[CHANNEL 39]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 623028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CJMT, Toronto Omni, physical channel 40, virtual channel 40, 19.5 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 40]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 629028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CIII, Toronto Global, physical channel 41, virtual channel 41, 38 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 41]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 635028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WNED, Buffalo PBS, physical channel 43, virtual channel 17, 473 kW, 1110' tower, 43.207500 -79.774167
+[CHANNEL 43]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 647028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CITY, Toronto independent, physical channel 44, virtual channel 57, 21 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 44]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 653028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CFMT, Toronto Omni 2, physical channel 47, virtual channel 47, 22.2 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 47]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 671028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WNYO, Buffalo MyN, physical channel 49, virtual channel 49, 198 kW, 946' tower, 42.782838 -78.457521
+[CHANNEL 49]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 683028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#------------------------------------------------------------------------------
+#
+# The following stations are much more difficult to receive from the Toronto
+# area, either weaker transmitters, being at odd angles, or are further from
+# the Toronto area
+#
+#------------------------------------------------------------------------------
+
+# WBBZ, Buffalo MeTV, physical channel 7, virtual channel 67, 26.9 kW, unknown tower, 42.567839 -78.723083
+[CHANNEL 7]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 177028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CKVR, Barrie A, physical channel 10, virtual channel 10, 11 kW, 1611' CN tower, 44.351389 -79.698333
+[CHANNEL 10]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 195028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CHEX, Peterborough CBC, physical channel 12, virtual channel 12, 20 kW, unknown tower, 44.328056 -78.299444
+[CHANNEL 12]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 207028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WPXJ, Batavia ION, physical channel 23, virtual channel 51, 455 kW, unknown tower, 42.895061 -78.015288
+[CHANNEL 23]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 527028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WYNB, Buffalo independent, physical channel 26, virtual channel 26, 243 kW, unknown tower, 42.393392 -79.228653
+[CHANNEL 26]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 545028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CKVP, St. Catherine's TVO, physical channel 42, virtual channel 42, 11 kW, 496' tower, 43.051667 -79.300833
+[CHANNEL 42]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 641028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#------------------------------------------------------------------------------
+#
+# The following stations are NTSC analog
+#
+#------------------------------------------------------------------------------
+
+# CHEX, Courtice CBC, physical channel 22, virtual channel 22, 6 kW, unknown tower, 43.954167 -78.806389
+#[CHANNEL 22]
+#	DELIVERY_SYSTEM = ATSC
+#	FREQUENCY = 521028615
+#	MODULATION = VSB/8
+#	INVERSION = AUTO
diff --git a/atsc/us-NTSC-center-frequencies b/atsc/us-NTSC-center-frequencies
new file mode 100644
index 0000000..7d92c05
--- /dev/null
+++ b/atsc/us-NTSC-center-frequencies
@@ -0,0 +1,520 @@
+# US NTSC center frequencies
+# primarily of historical interest, many of these channels are no longer used
+#
+# see also: us-ATSC-center-frequencies-8VSB
+
+#
+# VHF low-band, channels 2 to 6, not used for digital
+#
+
+[CHANNEL 2]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 57028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 3]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 63028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 4]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 69028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 5]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 79028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 6]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 85028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#
+# VHF high-band, channels 7 to 13. not common but a few digital stations use it
+# potentially hard to receive because modern antennas are tuned for UHF
+#
+
+[CHANNEL 7]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 177028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 8]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 183028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 9]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 189028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 10]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 195028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 11]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 201028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 12]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 207028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 13]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 213028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#
+# UHF, channels 14 to 51, most existing stations, almost all digital
+#
+
+[CHANNEL 14]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 473028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 15]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 479028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 16]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 485028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 17]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 491028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 18]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 497028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 19]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 503028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 20]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 509028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 21]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 515028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 22]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 521028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 23]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 527028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 24]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 533028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 25]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 539028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 26]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 545028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 27]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 551028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 28]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 557028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 29]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 563028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 30]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 569028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 31]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 575028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 32]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 581028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 33]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 587028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 34]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 593028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 35]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 599028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 36]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 605028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#channel 37, not used in North America due to interference with radio astronomy bands
+[CHANNEL 37]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 611028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 38]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 617028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 39]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 623028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 40]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 629028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 41]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 635028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 42]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 641028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 43]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 647028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 44]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 653028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 45]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 659028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 46]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 665028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 47]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 671028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 48]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 677028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 49]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 683028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 50]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 689028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#
+# the following frequencies were formerly part of the UHF band before the digital transition
+# but were sold off to cell carriers in 2010 as the 700 MHz band and are no longer used for television
+#
+
+#channel 51 was originally included in the digital transition but
+# no longer used to clear interference with 700 MHz cell bands
+[CHANNEL 51]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 695028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 52]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 701028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 53]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 707028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 54]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 713028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 55]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 719028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 56]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 725028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 57]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 731028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 58]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 737028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 59]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 743028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 60]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 749028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 61]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 755028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 62]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 761028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 63]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 767028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 64]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 773028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 65]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 779028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 66]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 785028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 67]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 791028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 68]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 797028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 69]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 803028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# UHF formerly had channels 70 through 83 as well
+
+[CHANNEL 70]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 809000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 71]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 815000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 72]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 821000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 73]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 827000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 74]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 833000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 75]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 839000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 76]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 845000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 77]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 851000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 78]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 857000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 79]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 863000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 80]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 869000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 81]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 875000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 82]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 881000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 83]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 887000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
diff --git a/atsc/us-NTSC-center-frequencies-8VSB b/atsc/us-NTSC-center-frequencies-8VSB
deleted file mode 100644
index 8f153af..0000000
--- a/atsc/us-NTSC-center-frequencies-8VSB
+++ /dev/null
@@ -1,410 +0,0 @@
-# US NTSC center frequencies, use if in doubt
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 57000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 63000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 69000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 79000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 85000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 177000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 183000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 189000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 195000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 201000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 207000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 213000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 473000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 479000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 485000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 491000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 497000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 503000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 509000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 515000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 521000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 527000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 533000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 539000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 545000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 551000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 557000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 563000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 569000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 575000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 581000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 587000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 593000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 599000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 605000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 611000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 617000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 623000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 629000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 635000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 641000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 647000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 653000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 659000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 665000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 671000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 677000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 683000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 689000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 695000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 701000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 707000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 713000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 719000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 725000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 731000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 737000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 743000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 749000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 755000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 761000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 767000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 773000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 779000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 785000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 791000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 797000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 803000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-