Merge tag 'upstream/0+git20170425.fb5fe05'

Upstream version 0+git20170425.fb5fe05

16 files changed, 786 insertions, 102 deletions

diff --git a/atsc/us-ATSC-center-frequencies-8VSB-062009 b/atsc/us-ATSC-center-frequencies-8VSB-062009
new file mode 100644
index 0000000..3be770d
--- /dev/null
+++ b/atsc/us-ATSC-center-frequencies-8VSB-062009
@@ -0,0 +1,306 @@
+# US ATSC center frequencies, ch 52 to 69 removed.
+# Use this if you wish to avoid scanning ch 52 to 69.
+# ch 52 thru 69 are unused for ATSC
+# in the USA since June 2009
+# in Canada since September 2011
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 57028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 63028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 69028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 79028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 85028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 177028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 183028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 189028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 195028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 201028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 207028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 213028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 473028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 479028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 485028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 491028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 497028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 503028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 509028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 515028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 521028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 527028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 533028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 539028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 545028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 551028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 557028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 563028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 569028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 575028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 581028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 587028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 593028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 599028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 605028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 611028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 617028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 623028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 629028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 635028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 641028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 647028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 653028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 659028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 665028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 671028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 677028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 683028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 689028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 695028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
diff --git a/dvb-t/au-Adelaide b/dvb-t/au-Adelaide
index 5376dd8..3bcf839 100644..100755
--- a/dvb-t/au-Adelaide
+++ b/dvb-t/au-Adelaide
@@ -1,8 +1,8 @@
 # Australia / Adelaide / Mt Lofty
-# ABC
+# Seven
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 226500000
+	FREQUENCY = 177500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -12,23 +12,23 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# Seven
+# SBS
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 177500000
+	FREQUENCY = 184500000
 	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
+	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
 	MODULATION = QAM/64
 	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+	GUARD_INTERVAL = 1/8
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
 # Nine
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 191625000
+	FREQUENCY = 191500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -51,27 +51,27 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# SBS
+# ABC
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 564500000
+	FREQUENCY = 226500000
 	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 2/3
+	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
 	MODULATION = QAM/64
 	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
+	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# 3D Trial Australia
+# Channel 44
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 536625000
+	FREQUENCY = 564500000
 	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
+	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
-	MODULATION = QAM/16
+	MODULATION = QPSK
 	TRANSMISSION_MODE = 8K
 	GUARD_INTERVAL = 1/8
 	HIERARCHY = NONE
diff --git a/dvb-t/au-Newcastle b/dvb-t/au-Newcastle
index dd634e4..39fab93 100644
--- a/dvb-t/au-Newcastle
+++ b/dvb-t/au-Newcastle
@@ -28,7 +28,7 @@
 # Prime
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 704500000
+	FREQUENCY = 578500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -54,7 +54,7 @@
 # SC10
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 690500000
+	FREQUENCY = 606500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
diff --git a/dvb-t/de-Bayern b/dvb-t/de-Bayern
index 0d4182f..a71cbca 100644
--- a/dvb-t/de-Bayern
+++ b/dvb-t/de-Bayern
@@ -50,7 +50,7 @@
 	INVERSION = AUTO
 
                                             # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-[CH29: Das Erste, arte, Phoenix, EinsPlus]
+[CH29: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 538000000
 	BANDWIDTH_HZ = 8000000
@@ -62,7 +62,7 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[CH30: Das Erste, arte, Phoenix, EinsPlus]
+[CH30: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 546000000
 	BANDWIDTH_HZ = 8000000
@@ -74,6 +74,18 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 [CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 570000000
@@ -98,7 +110,7 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[CH36: Das Erste, arte, Phoenix, EinsPlus]
+[CH36: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 594000000
 	BANDWIDTH_HZ = 8000000
@@ -135,7 +147,19 @@
 	INVERSION = AUTO
 
                                             # CH40: Das Erste, arte, Phoenix, EinsPlus
-[CH42: Das Erste, arte, Phoenix, EinsPlus]
+[CH41: Das Erste, arte, Phoenix, One]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH42: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 642000000
 	BANDWIDTH_HZ = 8000000
@@ -160,7 +184,7 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[CH45: Das Erste, arte, Phoenix, EinsPlus]
+[CH45: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 666000000
 	BANDWIDTH_HZ = 8000000
@@ -198,7 +222,7 @@
 	INVERSION = AUTO
 
                                             # CH47: Das Erste, arte, Phoenix, EinsPlus
-[CH49: Das Erste, arte, Phoenix, EinsPlus]
+[CH49: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 698000000
 	BANDWIDTH_HZ = 8000000
@@ -223,7 +247,7 @@
 	INVERSION = AUTO
 
                                             # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-[CH55: Das Erste, arte, Phoenix, EinsPlus]
+[CH55: Das Erste, arte, Phoenix, One]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 746000000
 	BANDWIDTH_HZ = 8000000
@@ -235,3 +259,15 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CH58: Bayerisches Fernsehen, BR-alpha, MDR, hr]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/fi-Espoo b/dvb-t/fi-Espoo
index ceb906d..6fb0ff2 100644
--- a/dvb-t/fi-Espoo
+++ b/dvb-t/fi-Espoo
@@ -18,16 +18,16 @@
 
 [Espoo-E]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 730000000
+	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 8000000
 
 [Espoo-D]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 586000000
+	FREQUENCY = 650000000
 	BANDWIDTH_HZ = 8000000
 
 [Espoo-H]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 514000000
+	FREQUENCY = 618000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Fiskars b/dvb-t/fi-Fiskars
index 0f84bb7..2b6b791 100644
--- a/dvb-t/fi-Fiskars
+++ b/dvb-t/fi-Fiskars
@@ -8,7 +8,7 @@
 
 [Fiskars]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 658000000
+	FREQUENCY = 498000000
 	BANDWIDTH_HZ = 8000000
 
 [Fiskars]
@@ -18,6 +18,6 @@
 
 [Fiskars]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	FREQUENCY = 490000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Kustavi_Viherlahti b/dvb-t/fi-Kustavi_Viherlahti
index ecef74d..9840401 100644
--- a/dvb-t/fi-Kustavi_Viherlahti
+++ b/dvb-t/fi-Kustavi_Viherlahti
@@ -3,21 +3,21 @@
 
 [Kustavi_Viherlahti]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 714000000
+	FREQUENCY = 538000000
 	BANDWIDTH_HZ = 8000000
 
 [Kustavi_Viherlahti]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 738000000
+	FREQUENCY = 658000000
 	BANDWIDTH_HZ = 8000000
 
 [Kustavi_Viherlahti]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 762000000
+	FREQUENCY = 682000000
 	BANDWIDTH_HZ = 8000000
 
 [Kustavi_Viherlahti]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 786000000
+	FREQUENCY = 634000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Lahti b/dvb-t/fi-Lahti
index f4c89b8..ea4163c 100644
--- a/dvb-t/fi-Lahti
+++ b/dvb-t/fi-Lahti
@@ -13,21 +13,21 @@
 
 [Lahti-C]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 762000000
+	FREQUENCY = 626000000
 	BANDWIDTH_HZ = 8000000
 
 [Lahti-E]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 714000000
+	FREQUENCY = 690000000
 	BANDWIDTH_HZ = 8000000
 
 [Lahti-D]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 626000000
+	FREQUENCY = 602000000
 	BANDWIDTH_HZ = 8000000
 
 [Lahti-H]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 690000000
+	FREQUENCY = 642000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Salo_Isokyla b/dvb-t/fi-Salo_Isokyla
index 42df3b4..0cf08b8 100644
--- a/dvb-t/fi-Salo_Isokyla
+++ b/dvb-t/fi-Salo_Isokyla
@@ -3,7 +3,7 @@
 
 [Salo_Isokyla]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 514000000
+	FREQUENCY = 610000000
 	BANDWIDTH_HZ = 8000000
 
 [Salo_Isokyla]
@@ -13,11 +13,11 @@
 
 [Salo_Isokyla]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 682000000
+	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
 
 [Salo_Isokyla]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 570000000
+	FREQUENCY = 690000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Tampere b/dvb-t/fi-Tampere
index 27cf3a7..33d40c4 100644
--- a/dvb-t/fi-Tampere
+++ b/dvb-t/fi-Tampere
@@ -13,21 +13,21 @@
 
 [Tampere-C]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	FREQUENCY = 658000000
 	BANDWIDTH_HZ = 8000000
 
 [Tampere-E]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 778000000
+	FREQUENCY = 674000000
 	BANDWIDTH_HZ = 8000000
 
 [Tampere-D]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 642000000
+	FREQUENCY = 650000000
 	BANDWIDTH_HZ = 8000000
 
 [Tampere-H]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 674000000
+	FREQUENCY = 498000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Tampere_Pyynikki b/dvb-t/fi-Tampere_Pyynikki
index 03e8ecc..1da6662 100644
--- a/dvb-t/fi-Tampere_Pyynikki
+++ b/dvb-t/fi-Tampere_Pyynikki
@@ -8,7 +8,7 @@
 
 [Tampere_Pyynikki]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 658000000
+	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 8000000
 
 [Tampere_Pyynikki]
@@ -18,11 +18,11 @@
 
 [Tampere_Pyynikki]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 586000000
+	FREQUENCY = 610000000
 	BANDWIDTH_HZ = 8000000
 
 [Tampere_Pyynikki]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 642000000
+	FREQUENCY = 562000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fi-Turku b/dvb-t/fi-Turku
index e3907a6..dd29eb5 100644
--- a/dvb-t/fi-Turku
+++ b/dvb-t/fi-Turku
@@ -3,31 +3,31 @@
 
 [Turku-A]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 714000000
+	FREQUENCY = 538000000
 	BANDWIDTH_HZ = 8000000
 
 [Turku-B]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 738000000
+	FREQUENCY = 658000000
 	BANDWIDTH_HZ = 8000000
 
 [Turku-C]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 762000000
+	FREQUENCY = 682000000
 	BANDWIDTH_HZ = 8000000
 
 [Turku-E]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 786000000
+	FREQUENCY = 634000000
 	BANDWIDTH_HZ = 8000000
 
 [Turku-D]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 538000000
+	FREQUENCY = 594000000
 	BANDWIDTH_HZ = 8000000
 
 [Turku-H]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 698000000
+	FREQUENCY = 570000000
 	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/fr-Paris b/dvb-t/fr-Paris
new file mode 100644
index 0000000..57a7362
--- /dev/null
+++ b/dvb-t/fr-Paris
@@ -0,0 +1,103 @@
+# en : Paris - France - various DVB-T transmitters
+# fr : Paris - France - differents emetteurs DVB-T de la Tour Eiffel
+# Latest update for the data / derniere mise a jour des donnees : 2017-01-01
+#
+# City                   Multiplex number : R1 R2 R3 R4 R6 R7 R15
+# Paris - Eiffel Tower - Channel number   : 35 25 22 30 32 42 28
+#
+# Note :
+# R8 - Is no longer used since the 05/04/2016 - Channel 58 is no longer used
+# R5 - Is no longer used since the 05/04/2016 - Channel 28 Re-assigned for R15
+#
+
+# R1 - Channel/Canal 35 -  Groupe GR1 A (France 2 HD, France 4 HD, France Ô SD, franceinfo: SD), Groupe GR 1 (France 3-Paris Ile de France), Groupe R1 TFL (BFM Business Paris HD)
+[CHANNEL 35]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# R2 - Channel/Canal 25 - Groupe NTN (C8, BFM TV, I-Tele, CStar, Gulli)
+[CHANNEL 25]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# R3 - Channel/Canal 22 - Groupe CNH (Canal+, Canal+ Cinema, Canal+ Sport, Planete+, LCI, Paris Premiere, ?, ?, ?, DATASYSTEM R7, ?)
+[CHANNEL 22]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# R4 - Channel/Canal 30 - Groupe Multi4 (M6, W9, Arte, France5, 6ter)
+[CHANNEL 30]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# R6 - Channel/Canal 32 - Groupe SMR6 (TF1, NRJ12, TMC, NT1, LCP-Public Senat)
+[CHANNEL 32]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# R7 - Channel/Canal 42 - Groupe MHD7 (HD1, Cherie 25, L equipe 21, RMC Decouverte, Numero 23)
+[CHANNEL 42]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# R15 - Channel 28 - local channels only on Paris - Eiffel tower transmitter
+# Group Multi-7 (Canal 31, IDF1, France 24, Canal 34)
+[CHANNEL 28]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530166000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
diff --git a/dvb-t/ke-Nairobi b/dvb-t/ke-Nairobi
new file mode 100644
index 0000000..eb06512
--- /dev/null
+++ b/dvb-t/ke-Nairobi
@@ -0,0 +1,226 @@
+# location and provider	: Nairobi-Kenya
+# date			: 2016-12-03
+# provided by		: Joseph Zikusooka
+# 	               	: http://joseph.zikusooka.com
+# 	               	: josephzik@gmail.com
+#
+#------------------------------------------------------------------------------
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT22
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = AUTO
+	STREAM_ID = 4294967295
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT22
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = AUTO
+	STREAM_ID = 4294967295
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 851968000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = 3/4
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 4K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = 1
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 1007943680
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 1645032704
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 5940000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 5060000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 6740000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/ua-Kiev b/dvb-t/ua-Kiev
deleted file mode 100644
index 6bf096b..0000000
--- a/dvb-t/ua-Kiev
+++ /dev/null
@@ -1,49 +0,0 @@
-# Ukraine, Kiev
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 526000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/256
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = NONE
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 538000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/256
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = NONE
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 554000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/256
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = NONE
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 698000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/256
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = NONE
-	INVERSION = AUTO
-
diff --git a/dvb-t/ua-Kyiv b/dvb-t/ua-Kyiv
new file mode 100644
index 0000000..52dd12b
--- /dev/null
+++ b/dvb-t/ua-Kyiv
@@ -0,0 +1,62 @@
+# Ukraine, Kyiv
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538167000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634167000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_LP = NONE
+	HIERARCHY = NONE
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650167000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_LP = NONE
+	HIERARCHY = NONE
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	INVERSION = AUTO