aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2013-08-07 00:18:16 +0100
committerJonathan McCrohan <jmccrohan@gmail.com>2013-08-07 00:18:16 +0100
commitaa83c76508a2b24ec58685da90fd100b70267f56 (patch)
treed095fc9d931e6eeb4e0b04fc2d16c51299bf4b61
parent7978d8ff923d07240a8791a3653f195732d48736 (diff)
parentd01de06fc92ddf51e2b3085ed00d2999a9e2055d (diff)
downloaddtv-scan-tables-aa83c76508a2b24ec58685da90fd100b70267f56.tar.gz
Merge tag 'upstream/0+git20130622.edc0bc3'
Upstream version 0+git20130622.edc0bc3
Diffstat (limited to '')
-rw-r--r--channels-conf/dvb-t/tw-All21
-rw-r--r--dvb-c/de-Kabel_BW2
-rw-r--r--dvb-c/de-NetAachen47
-rw-r--r--dvb-c/de-Primacom69
-rw-r--r--dvb-s/Astra-31.5E8
-rw-r--r--dvb-s/Atlantic-Bird-1-12.5W9
-rw-r--r--dvb-s/Atlantic-Bird-3-5.0W35
-rw-r--r--dvb-s/Hotbird-13.0E9
-rw-r--r--dvb-s/Intelsat-12-45.0E13
-rw-r--r--dvb-t/at-All53
-rw-r--r--dvb-t/at-Official24
-rw-r--r--dvb-t/bg-Sofia16
-rw-r--r--dvb-t/fr-All42
-rw-r--r--dvb-t/fr-Bordeaux9
-rw-r--r--dvb-t/ru-Krasnodar6
-rw-r--r--dvb-t/ru-Novosibirsk6
-rw-r--r--dvb-t/ru-Volgodonsk6
-rw-r--r--dvb-t/tw-All11
-rw-r--r--dvb-t/tw-Kaohsiung6
-rw-r--r--dvb-t/tw-Taipei7
-rw-r--r--dvb-t/ua-Kharkov6
-rw-r--r--dvb-t/ua-Kiev6
-rw-r--r--dvb-t/ua-Lozovaya6
-rw-r--r--dvb-t/ua-Odessa6
24 files changed, 340 insertions, 83 deletions
diff --git a/channels-conf/dvb-t/tw-All b/channels-conf/dvb-t/tw-All
new file mode 100644
index 0000000..a7fbe50
--- /dev/null
+++ b/channels-conf/dvb-t/tw-All
@@ -0,0 +1,21 @@
+中視數位台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1002:100
+中視新聞台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1011:1012:101
+中視綜藝台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1021:1022:102
+中視HD台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1031:1032:103
+公共電視 PTS:545000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2011:2012:201
+公視2台 PTS2:545000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2021:2022:202
+客家電視 HTV:545000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2031:2032:203
+民視綜合台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3001:3002:300
+民視交通台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3011:3012:301
+民視新聞台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3021:3022:302
+民視資料廣播:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:303
+民視HD台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3041:3042:304
+公視 HD:569000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2001:2002:200
+台灣電視台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4001:4002:400
+台視財經台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4011:4012:401
+台視綜合台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4021:4022:402
+台視 HD台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4031:4032:403
+華視CTS:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5011:5012:501
+華視教育台:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5021:5022:502
+華視新聞資訊台:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5031:5032:503
+華視HD:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5041:5042:504
diff --git a/dvb-c/de-Kabel_BW b/dvb-c/de-Kabel_BW
index 437579f..9a8d6e9 100644
--- a/dvb-c/de-Kabel_BW
+++ b/dvb-c/de-Kabel_BW
@@ -13,4 +13,4 @@
# Dirk Ritter <dirk@GNUmatic.de>
#
# freq sr fec mod
-C 113000000 6900000 NONE QAM64
+C 114000000 6900000 NONE QAM256
diff --git a/dvb-c/de-NetAachen b/dvb-c/de-NetAachen
new file mode 100644
index 0000000..9cf2db9
--- /dev/null
+++ b/dvb-c/de-NetAachen
@@ -0,0 +1,47 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20120605 1 0 CABLE DE </w_scan>
+# Manually adjusted by reducing whitespace between fec and mod
+#------------------------------------------------------------------------------
+# location and provider: Germany, Aachen, NetAachen, http://www.netaachen.de/
+# date (yyyy-mm-dd) : 2013-04-11
+# provided by (opt) : Till Maas <opensource@till.name>
+#
+# C[2] [plp_id] [data_slice_id] [system_id] <freq> <sr> <fec> <mod> [# comment]
+#------------------------------------------------------------------------------
+C 113000000 6900000 AUTO QAM256 # NetCologne
+C 642000000 6900000 AUTO QAM256 # NetCologne
+C 618000000 6900000 AUTO QAM256 # NetCologne
+C 634000000 6900000 AUTO QAM256 # NetCologne
+C 626000000 6900000 AUTO QAM256 # NetCologne
+C 562000000 6900000 AUTO QAM256 # NetCologne
+C 402000000 6900000 AUTO QAM256 # NetCologne
+C 121000000 6900000 AUTO QAM256 # NetCologne
+C 570000000 6900000 AUTO QAM256 # NetCologne
+C 394000000 6900000 AUTO QAM256 # NetCologne
+C 586000000 6900000 AUTO QAM256 # NetCologne
+C 650000000 6900000 AUTO QAM256 # NetCologne
+C 658000000 6900000 AUTO QAM256 # NetCologne
+C 666000000 6900000 AUTO QAM256 # NetCologne
+C 674000000 6900000 AUTO QAM256 # NetCologne
+C 682000000 6900000 AUTO QAM256 # NetCologne
+C 690000000 6900000 AUTO QAM256
+C 714000000 6900000 AUTO QAM256
+C 602000000 6900000 AUTO QAM256
+C 410000000 6900000 AUTO QAM256 # NetCologne
+C 418000000 6900000 AUTO QAM256 # NetCologne
+C 530000000 6900000 AUTO QAM256 # NetCologne
+C 538000000 6900000 AUTO QAM256 # NetCologne
+C 346000000 6900000 AUTO QAM256 # NetCologne
+C 338000000 6900000 AUTO QAM256 # NetCologne
+C 129000000 6900000 AUTO QAM256 # NetCologne
+C 354000000 6900000 AUTO QAM64 # BetaDigital
+C 362000000 6900000 AUTO QAM64 # BetaDigital
+C 370000000 6900000 AUTO QAM64 # BetaDigital
+C 386000000 6900000 AUTO QAM64 # BetaDigital
+C 378000000 6900000 AUTO QAM64 # BetaDigital
+C 610000000 6900000 AUTO QAM256
+C 578000000 6900000 AUTO QAM256
+C 698000000 6900000 AUTO QAM256
+C 706000000 6900000 AUTO QAM256
diff --git a/dvb-c/de-Primacom b/dvb-c/de-Primacom
index 1e99b4c..9b8dd24 100644
--- a/dvb-c/de-Primacom
+++ b/dvb-c/de-Primacom
@@ -1,28 +1,41 @@
-# Primacom
-# freq sr fec mod
-C 121000000 6900000 NONE QAM64
-C 129000000 6900000 NONE QAM256
-C 137000000 6900000 NONE QAM256
-C 145000000 6900000 NONE QAM256
-C 306000000 6900000 NONE QAM64
-C 314000000 6900000 NONE QAM64
-C 322000000 6900000 NONE QAM64
-C 330000000 6900000 NONE QAM64
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 418000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 610000000 6900000 NONE QAM64
-C 746000000 6900000 NONE QAM64
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20130331 1 0 CABLE DE </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Chemnitz Primacom
+# date (yyyy-mm-dd) : 2013-06-22
+# provided by (opt) : Sven Eckelmann <sven@narfation.org>
+#
+# C[2] [plp_id] [data_slice_id] [system_id] <freq> <sr> <fec> <mod> [# comment]
+#------------------------------------------------------------------------------
+C 121000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 169000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 314000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 338000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 346000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 354000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 362000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 370000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 378000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 386000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 394000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 402000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 410000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 746000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 754000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 762000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 418000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 330000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 434000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 442000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 450000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 458000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 466000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 129000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 137000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 145000000 6900000 NONE QAM64 # PrimaCom A.G.
+C 306000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 322000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 153000000 6900000 NONE QAM256 # PrimaCom A.G.
+C 161000000 6900000 NONE QAM256 # PrimaCom A.G.
diff --git a/dvb-s/Astra-31.5E b/dvb-s/Astra-31.5E
new file mode 100644
index 0000000..a18479e
--- /dev/null
+++ b/dvb-s/Astra-31.5E
@@ -0,0 +1,8 @@
+# Astra 1G @ 31.5E
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
+S2 11992000 H 27500000 AUTO AUTO 8PSK 10
+S2 11992000 H 27500000 AUTO AUTO 8PSK 20
+S2 12148000 H 27500000 AUTO AUTO 8PSK 30
+S2 12148000 H 27500000 AUTO AUTO 8PSK 40
+S 12304500 H 27500000 AUTO AUTO QPSK
diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W
index 6735d70..e2d5cbe 100644
--- a/dvb-s/Atlantic-Bird-1-12.5W
+++ b/dvb-s/Atlantic-Bird-1-12.5W
@@ -1,5 +1,6 @@
# Atlantic Bird 1 @ 12.5W
-# freq pol sr fec
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
S 11099000 H 2000000 5/6
S 11132000 H 3255000 3/4
S 11136000 V 3700000 5/6
@@ -24,7 +25,11 @@ S 12594000 H 2170000 3/4
S 12597000 H 1730000 3/4
S 12604000 H 1481000 3/4
S 12655000 H 4285000 3/4
-S 12659000 H 2141000 3/4
+S 12658000 H 2141000 3/4
S 12662000 V 3928000 3/4
+S2 12718000 H 36510000 AUTO AUTO 8PSK 33
+S2 12718000 H 36510000 AUTO AUTO 8PSK 34
+S2 12718000 H 36510000 AUTO AUTO 8PSK 35
+S2 12718000 H 36510000 AUTO AUTO 8PSK 36
S 12720000 V 1808000 3/4
S 12743000 V 3214000 3/4
diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W
index 4e7f007..671ecb4 100644
--- a/dvb-s/Atlantic-Bird-3-5.0W
+++ b/dvb-s/Atlantic-Bird-3-5.0W
@@ -1,4 +1,33 @@
# Atlantic Bird 3 @ 5.0W
-# freq pol sr fec
-S 11096000 V 29950000 7/8
-S 11591000 V 20000000 2/3
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
+S2 11012000 V 30000000 AUTO AUTO 8PSK 2 16416
+S2 11012000 V 30000000 AUTO AUTO 8PSK 3 16416
+S2 11012000 V 30000000 AUTO AUTO 8PSK 11 16416
+S2 11179000 V 30000000 AUTO AUTO 8PSK 4 16416
+S2 11179000 V 30000000 AUTO AUTO 8PSK 5 16416
+S2 11179000 V 30000000 AUTO AUTO 8PSK 12 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 1 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 2 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 3 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 4 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 5 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 6 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 7 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 8 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 9 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 10 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 11 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 12 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 13 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 14 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 15 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 16 16416
+S2 12585000 H 27500000 AUTO AUTO 8PSK 1 8
+S2 12585000 H 27500000 AUTO AUTO 8PSK 2 8
+S2 12606000 V 29900000 AUTO AUTO 8PSK 1 8
+S2 12606000 V 29900000 AUTO AUTO 8PSK 2 8
+S2 12648000 V 29500000 AUTO AUTO 8PSK 1 121212 1
+S2 12648000 V 29500000 AUTO AUTO 8PSK 2 121212 1
+S2 12669000 H 30080000 AUTO AUTO 8PSK 1 8
+S2 12669000 H 30080000 AUTO AUTO 8PSK 2 8
diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E
index 7c916a8..9bf01bf 100644
--- a/dvb-s/Hotbird-13.0E
+++ b/dvb-s/Hotbird-13.0E
@@ -1,6 +1,6 @@
# EUTELSAT SkyPlex, Hotbird 13E
-# freq pol sr fec
-S 12539000 H 27500000 3/4
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
S 10719000 V 27500000 3/4
S 10723000 H 29900000 3/4
S 10757000 V 27500000 3/4
@@ -34,7 +34,8 @@ S 11355000 V 27500000 3/4
S 11373000 H 27500000 2/3
S 11393000 V 27500000 3/4
S 11411000 H 27500000 5/6
-S 11432000 V 27500000 2/3
+S2 11432000 V 27500000 2/3 AUTO 8PSK 1 8
+S2 11432000 V 27500000 2/3 AUTO 8PSK 2 8
S 11470000 V 27500000 5/6
S 11488000 H 27500000 3/4
S 11526000 H 27500000 3/4
@@ -84,6 +85,8 @@ S 12418000 V 27500000 3/4
S 12437000 H 27500000 3/4
S 12475000 H 27500000 3/4
S 12519000 V 27500000 3/4
+S2 12539000 H 27500000 2/3 AUTO 8PSK 1 8
+S2 12539000 H 27500000 2/3 AUTO 8PSK 2 8
S 12558000 V 27500000 3/4
S 12577000 H 27500000 3/4
S 12596000 V 27500000 3/4
diff --git a/dvb-s/Intelsat-12-45.0E b/dvb-s/Intelsat-12-45.0E
new file mode 100644
index 0000000..23b15c6
--- /dev/null
+++ b/dvb-s/Intelsat-12-45.0E
@@ -0,0 +1,13 @@
+# Intelsat 12 @ 45.0E
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
+S2 11468000 V 30000000 AUTO AUTO 8PSK
+S2 11495000 V 7299000 AUTO AUTO 8PSK
+S 11517000 V 2959000 AUTO
+S 11523000 V 5787000 AUTO
+S2 11550000 V 30000000 AUTO AUTO 8PSK
+S2 11591000 V 30000000 AUTO AUTO 8PSK 2
+S2 11591000 V 30000000 AUTO AUTO 8PSK 3
+S2 11591000 V 30000000 AUTO AUTO 8PSK 4
+S2 11632000 V 30000000 AUTO AUTO 8PSK
+S2 11673000 V 30000000 AUTO AUTO 8PSK
diff --git a/dvb-t/at-All b/dvb-t/at-All
new file mode 100644
index 0000000..5d179eb
--- /dev/null
+++ b/dvb-t/at-All
@@ -0,0 +1,53 @@
+# Austria, all DVB-T transmitters run by ORS
+# Created from
+# http://www.ors.at/fileadmin/user_upload/downloads/DVB-T_Kanalbezeichnungen_und_Mittenfrequenzen.pdf
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 482000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 498000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 506000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 522000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 530000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 570000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
+T 586000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 618000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 626000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 642000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 658000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 674000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 682000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 690000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 706000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 714000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 738000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 746000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 770000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 778000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 786000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 794000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 802000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 810000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 826000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 834000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 842000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 850000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 858000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/at-Official b/dvb-t/at-Official
deleted file mode 100644
index cdb221c..0000000
--- a/dvb-t/at-Official
+++ /dev/null
@@ -1,24 +0,0 @@
-# Austria, all DVB-T transmitters run by ORS
-# Created from http://www.ors.at/view08/ors.php?mid=94
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/bg-Sofia b/dvb-t/bg-Sofia
new file mode 100644
index 0000000..82cc037
--- /dev/null
+++ b/dvb-t/bg-Sofia
@@ -0,0 +1,16 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20130331 1 0 TERRESTRIAL BG </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Sofia
+# date (yyyy-mm-dd) : 2013-05-13
+# provided by (opt) : v.lalov@gmail.com
+#
+# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # NURTS Digital
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # NURTS Digital
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # First Digital
+T 818000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE # NURTS
+
diff --git a/dvb-t/fr-All b/dvb-t/fr-All
new file mode 100644
index 0000000..77c77d5
--- /dev/null
+++ b/dvb-t/fr-All
@@ -0,0 +1,42 @@
+# France ALL (All channel 21 to 60)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 21
+T 482000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 22
+T 490000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 23
+T 498000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 24
+T 506000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 25
+T 514000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 26
+T 522000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 27
+T 530000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 28
+T 538000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 29
+T 546000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 30
+T 554000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 31
+T 562000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 32
+T 570000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 33
+T 578000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 34
+T 586000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 35
+T 594000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 36
+T 602000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 37
+T 610000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 38
+T 618000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 39
+T 626000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 40
+T 634000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 41
+T 642000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 42
+T 650000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 43
+T 658000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 44
+T 666000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 45
+T 674000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 46
+T 682000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 47
+T 690000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 48
+T 698000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 49
+T 706000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 50
+T 714000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 51
+T 722000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 52
+T 730000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 53
+T 738000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 54
+T 746000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 55
+T 754000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 56
+T 762000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 57
+T 770000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 58
+T 778000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 59
+T 786000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 60
diff --git a/dvb-t/fr-Bordeaux b/dvb-t/fr-Bordeaux
deleted file mode 100644
index 5efba4e..0000000
--- a/dvb-t/fr-Bordeaux
+++ /dev/null
@@ -1,9 +0,0 @@
-# Bordeaux - France (DVB-T transmitter of Bouliac or Cauderan)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/ru-Krasnodar b/dvb-t/ru-Krasnodar
new file mode 100644
index 0000000..51d58d0
--- /dev/null
+++ b/dvb-t/ru-Krasnodar
@@ -0,0 +1,6 @@
+# Russia, Krasnodar
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
+T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
diff --git a/dvb-t/ru-Novosibirsk b/dvb-t/ru-Novosibirsk
new file mode 100644
index 0000000..443c7e4
--- /dev/null
+++ b/dvb-t/ru-Novosibirsk
@@ -0,0 +1,6 @@
+# Russia, Novosibirsk
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
+T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
diff --git a/dvb-t/ru-Volgodonsk b/dvb-t/ru-Volgodonsk
new file mode 100644
index 0000000..2089a70
--- /dev/null
+++ b/dvb-t/ru-Volgodonsk
@@ -0,0 +1,6 @@
+# Russia, Volgodonsk
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
+T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
diff --git a/dvb-t/tw-All b/dvb-t/tw-All
new file mode 100644
index 0000000..8290355
--- /dev/null
+++ b/dvb-t/tw-All
@@ -0,0 +1,11 @@
+T 533000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 539000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 545000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 551000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 563000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 569000000 6MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 575000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 587000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/tw-Kaohsiung b/dvb-t/tw-Kaohsiung
deleted file mode 100644
index f1eabc9..0000000
--- a/dvb-t/tw-Kaohsiung
+++ /dev/null
@@ -1,6 +0,0 @@
-# Taiwan - Kaohsiung, southern Taiwan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-t/tw-Taipei b/dvb-t/tw-Taipei
deleted file mode 100644
index 3bba686..0000000
--- a/dvb-t/tw-Taipei
+++ /dev/null
@@ -1,7 +0,0 @@
-# Taiwan - Taipei, northern Taiwan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 533000000 6MHz 1/2 NONE QAM16 8k 1/8 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/ua-Kharkov b/dvb-t/ua-Kharkov
new file mode 100644
index 0000000..c206c90
--- /dev/null
+++ b/dvb-t/ua-Kharkov
@@ -0,0 +1,6 @@
+# Ukraine, Kharkov
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 586000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 690000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 770000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Kiev b/dvb-t/ua-Kiev
new file mode 100644
index 0000000..6db2d56
--- /dev/null
+++ b/dvb-t/ua-Kiev
@@ -0,0 +1,6 @@
+# Ukraine, Kiev
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 526000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 538000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 698000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Lozovaya b/dvb-t/ua-Lozovaya
new file mode 100644
index 0000000..a0bfc09
--- /dev/null
+++ b/dvb-t/ua-Lozovaya
@@ -0,0 +1,6 @@
+# Ukraine, Lozovaya
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 746000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 754000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 778000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Odessa b/dvb-t/ua-Odessa
new file mode 100644
index 0000000..2420279
--- /dev/null
+++ b/dvb-t/ua-Odessa
@@ -0,0 +1,6 @@
+# Ukraine, Odessa
+# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
+T2 490000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 562000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 618000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+T2 650000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE