aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-t
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 15:10:06 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 15:10:06 -0300
commitcc90cb7196440a88e2a7987203152910049e266d (patch)
tree831616a68d841d14f0ac14068b4d6c2636995c8b /dvb-t
parent06e54ff221c2e3126a7dfbd63e9814431511b558 (diff)
downloaddtv-scan-tables-cc90cb7196440a88e2a7987203152910049e266d.tar.gz
Move the contents of dvbv5_dvb-t into dvb-t
Now that we have everything with DVBv5 format, we can get rid of duplicated tables. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'dvb-t')
-rw-r--r--dvb-t/fi-Aanekoski37
-rw-r--r--dvb-t/fi-Aanekoski_Konginkangas37
-rw-r--r--dvb-t/fi-Ahtari19
-rw-r--r--dvb-t/fi-Alajarvi37
-rw-r--r--dvb-t/fi-Anjalankoski_Ruotila48
-rw-r--r--dvb-t/fi-Enontekio_Ahovaara19
-rw-r--r--dvb-t/fi-Enontekio_Hetta19
-rw-r--r--dvb-t/fi-Enontekio_Kuttanen19
-rw-r--r--dvb-t/fi-Espoo63
-rw-r--r--dvb-t/fi-Eurajoki48
-rw-r--r--dvb-t/fi-Fiskars37
-rw-r--r--dvb-t/fi-Haapavesi37
-rw-r--r--dvb-t/fi-Hameenkyro_Kyroskoski37
-rw-r--r--dvb-t/fi-Hameenlinna_Painokangas28
-rw-r--r--dvb-t/fi-Hanko37
-rw-r--r--dvb-t/fi-Hartola28
-rw-r--r--dvb-t/fi-Heinavesi28
-rw-r--r--dvb-t/fi-Heinola37
-rw-r--r--dvb-t/fi-Hyrynsalmi28
-rw-r--r--dvb-t/fi-Hyrynsalmi_Kyparavaara28
-rw-r--r--dvb-t/fi-Hyrynsalmi_Paljakka28
-rw-r--r--dvb-t/fi-Hyvinkaa37
-rw-r--r--dvb-t/fi-Ii_Raiskio19
-rw-r--r--dvb-t/fi-Iisalmi19
-rw-r--r--dvb-t/fi-Ikaalinen37
-rw-r--r--dvb-t/fi-Ikaalinen_Riitiala37
-rw-r--r--dvb-t/fi-Inari19
-rw-r--r--dvb-t/fi-Inari_Janispaa19
-rw-r--r--dvb-t/fi-Inari_Naatamo19
-rw-r--r--dvb-t/fi-Ivalo_Saarineitamovaara19
-rw-r--r--dvb-t/fi-Jalasjarvi37
-rw-r--r--dvb-t/fi-Jamsa_Halli37
-rw-r--r--dvb-t/fi-Jamsa_Kaipola37
-rw-r--r--dvb-t/fi-Jamsa_Matkosvuori37
-rw-r--r--dvb-t/fi-Jamsa_Ouninpohja28
-rw-r--r--dvb-t/fi-Jamsankoski37
-rw-r--r--dvb-t/fi-Joensuu_Vestinkallio28
-rw-r--r--dvb-t/fi-Joroinen_Puukkola28
-rw-r--r--dvb-t/fi-Joutsa_Lankia37
-rw-r--r--dvb-t/fi-Joutseno48
-rw-r--r--dvb-t/fi-Juupajoki_Kopsamo28
-rw-r--r--dvb-t/fi-Juva37
-rw-r--r--dvb-t/fi-Jyvaskyla65
-rw-r--r--dvb-t/fi-Jyvaskyla_Vaajakoski28
-rw-r--r--dvb-t/fi-Kaavi_Sivakkavaara28
-rw-r--r--dvb-t/fi-Kajaani_Pollyvaara28
-rw-r--r--dvb-t/fi-Kalajoki28
-rw-r--r--dvb-t/fi-Kangaslampi37
-rw-r--r--dvb-t/fi-Kangasniemi_Turkinmaki37
-rw-r--r--dvb-t/fi-Kankaanpaa37
-rw-r--r--dvb-t/fi-Karigasniemi19
-rw-r--r--dvb-t/fi-Karkkila37
-rw-r--r--dvb-t/fi-Karstula28
-rw-r--r--dvb-t/fi-Karvia28
-rw-r--r--dvb-t/fi-Kaunispaa19
-rw-r--r--dvb-t/fi-Kemijarvi_Suomutunturi19
-rw-r--r--dvb-t/fi-Kerimaki37
-rw-r--r--dvb-t/fi-Keuruu37
-rw-r--r--dvb-t/fi-Keuruu_Haapamaki37
-rw-r--r--dvb-t/fi-Kihnio37
-rw-r--r--dvb-t/fi-Kiihtelysvaara19
-rw-r--r--dvb-t/fi-Kilpisjarvi19
-rw-r--r--dvb-t/fi-Kittila_Levitunturi19
-rw-r--r--dvb-t/fi-Kolari_Vuolittaja19
-rw-r--r--dvb-t/fi-Koli37
-rw-r--r--dvb-t/fi-Korpilahti_Vaarunvuori37
-rw-r--r--dvb-t/fi-Korppoo37
-rw-r--r--dvb-t/fi-Kruunupyy48
-rw-r--r--dvb-t/fi-Kuhmo_Haukela28
-rw-r--r--dvb-t/fi-Kuhmo_Lentiira28
-rw-r--r--dvb-t/fi-Kuhmo_Niva28
-rw-r--r--dvb-t/fi-Kuhmoinen37
-rw-r--r--dvb-t/fi-Kuhmoinen_Harjunsalmi37
-rw-r--r--dvb-t/fi-Kuhmoinen_Puukkoinen28
-rw-r--r--dvb-t/fi-Kuopio48
-rw-r--r--dvb-t/fi-Kurikka_Kesti37
-rw-r--r--dvb-t/fi-Kustavi_Viherlahti37
-rw-r--r--dvb-t/fi-Kuusamo_Hamppulampi19
-rw-r--r--dvb-t/fi-Kyyjarvi_Noposenaho28
-rw-r--r--dvb-t/fi-Lahti65
-rw-r--r--dvb-t/fi-Lapua48
-rw-r--r--dvb-t/fi-Laukaa37
-rw-r--r--dvb-t/fi-Laukaa_Vihtavuori37
-rw-r--r--dvb-t/fi-Lavia28
-rw-r--r--dvb-t/fi-Lohja37
-rw-r--r--dvb-t/fi-Loimaa37
-rw-r--r--dvb-t/fi-Luhanka37
-rw-r--r--dvb-t/fi-Luopioinen37
-rw-r--r--dvb-t/fi-Mantta37
-rw-r--r--dvb-t/fi-Mantyharju28
-rw-r--r--dvb-t/fi-Mikkeli37
-rw-r--r--dvb-t/fi-Muonio_Olostunturi19
-rw-r--r--dvb-t/fi-Nilsia37
-rw-r--r--dvb-t/fi-Nilsia_Keski-Siikajarvi28
-rw-r--r--dvb-t/fi-Nilsia_Pisa28
-rw-r--r--dvb-t/fi-Nokia37
-rw-r--r--dvb-t/fi-Nokia_Siuro37
-rw-r--r--dvb-t/fi-Nummi-Pusula_Hyonola37
-rw-r--r--dvb-t/fi-Nuorgam_Njallavaara19
-rw-r--r--dvb-t/fi-Nuorgam_raja19
-rw-r--r--dvb-t/fi-Nurmes_Konnanvaara37
-rw-r--r--dvb-t/fi-Nurmes_Kortevaara28
-rw-r--r--dvb-t/fi-Orivesi_Talviainen28
-rw-r--r--dvb-t/fi-Oulu65
-rw-r--r--dvb-t/fi-Padasjoki37
-rw-r--r--dvb-t/fi-Padasjoki_Arrakoski37
-rw-r--r--dvb-t/fi-Paltamo_Kivesvaara28
-rw-r--r--dvb-t/fi-Parainen_Houtskari37
-rw-r--r--dvb-t/fi-Parikkala37
-rw-r--r--dvb-t/fi-Parkano_Sopukallio37
-rw-r--r--dvb-t/fi-Pello19
-rw-r--r--dvb-t/fi-Pello_Ratasvaara19
-rw-r--r--dvb-t/fi-Perho37
-rw-r--r--dvb-t/fi-Pernaja28
-rw-r--r--dvb-t/fi-Pieksamaki_Halkokumpu28
-rw-r--r--dvb-t/fi-Pihtipudas28
-rw-r--r--dvb-t/fi-Porvoo_Suomenkyla37
-rw-r--r--dvb-t/fi-Posio19
-rw-r--r--dvb-t/fi-Pudasjarvi28
-rw-r--r--dvb-t/fi-Pudasjarvi_Iso-Syote28
-rw-r--r--dvb-t/fi-Pudasjarvi_Kangasvaara19
-rw-r--r--dvb-t/fi-Puolanka37
-rw-r--r--dvb-t/fi-Pyhatunturi19
-rw-r--r--dvb-t/fi-Pyhavuori28
-rw-r--r--dvb-t/fi-Pylkonmaki_Karankajarvi28
-rw-r--r--dvb-t/fi-Raahe_Mestauskallio37
-rw-r--r--dvb-t/fi-Raahe_Piehinki28
-rw-r--r--dvb-t/fi-Ranua_Haasionmaa19
-rw-r--r--dvb-t/fi-Ranua_Leppiaho19
-rw-r--r--dvb-t/fi-Rautavaara_Angervikko37
-rw-r--r--dvb-t/fi-Rautjarvi_Simpele28
-rw-r--r--dvb-t/fi-Ristijarvi28
-rw-r--r--dvb-t/fi-Rovaniemi28
-rw-r--r--dvb-t/fi-Rovaniemi_Kaihuanvaara19
-rw-r--r--dvb-t/fi-Rovaniemi_Karhuvaara19
-rw-r--r--dvb-t/fi-Rovaniemi_Marasenkallio19
-rw-r--r--dvb-t/fi-Rovaniemi_Rantalaki19
-rw-r--r--dvb-t/fi-Rovaniemi_Sonka19
-rw-r--r--dvb-t/fi-Rovaniemi_Sorviselka19
-rw-r--r--dvb-t/fi-Ruka28
-rw-r--r--dvb-t/fi-Ruovesi_Storminiemi37
-rw-r--r--dvb-t/fi-Saarijarvi37
-rw-r--r--dvb-t/fi-Saarijarvi_Kalmari28
-rw-r--r--dvb-t/fi-Saarijarvi_Mahlu28
-rw-r--r--dvb-t/fi-Salla_Hirvasvaara19
-rw-r--r--dvb-t/fi-Salla_Ihistysjanka19
-rw-r--r--dvb-t/fi-Salla_Naruska19
-rw-r--r--dvb-t/fi-Salla_Sallatunturi19
-rw-r--r--dvb-t/fi-Salla_Sarivaara19
-rw-r--r--dvb-t/fi-Salo_Isokyla37
-rw-r--r--dvb-t/fi-Savukoski_Martti19
-rw-r--r--dvb-t/fi-Savukoski_Tanhua19
-rw-r--r--dvb-t/fi-Siilinjarvi37
-rw-r--r--dvb-t/fi-Simo_Viantie28
-rw-r--r--dvb-t/fi-Sipoo_Norrkulla37
-rw-r--r--dvb-t/fi-Sodankyla_Pittiovaara19
-rw-r--r--dvb-t/fi-Sodankyla_Vuotso19
-rw-r--r--dvb-t/fi-Sulkava_Vaatalanmaki28
-rw-r--r--dvb-t/fi-Suomussalmi_Ala-Vuokki19
-rw-r--r--dvb-t/fi-Suomussalmi_Ammansaari19
-rw-r--r--dvb-t/fi-Suomussalmi_Juntusranta19
-rw-r--r--dvb-t/fi-Suomussalmi_Myllylahti19
-rw-r--r--dvb-t/fi-Sysma_Liikola37
-rw-r--r--dvb-t/fi-Taivalkoski19
-rw-r--r--dvb-t/fi-Taivalkoski_Taivalvaara19
-rw-r--r--dvb-t/fi-Tammela48
-rw-r--r--dvb-t/fi-Tammisaari37
-rw-r--r--dvb-t/fi-Tampere65
-rw-r--r--dvb-t/fi-Tampere_Pyynikki48
-rw-r--r--dvb-t/fi-Tervola28
-rw-r--r--dvb-t/fi-Turku65
-rw-r--r--dvb-t/fi-Utsjoki19
-rw-r--r--dvb-t/fi-Utsjoki_Nuvvus19
-rw-r--r--dvb-t/fi-Utsjoki_Outakoski19
-rw-r--r--dvb-t/fi-Utsjoki_Polvarniemi19
-rw-r--r--dvb-t/fi-Utsjoki_Rovisuvanto19
-rw-r--r--dvb-t/fi-Utsjoki_Tenola19
-rw-r--r--dvb-t/fi-Uusikaupunki_Orivo37
-rw-r--r--dvb-t/fi-Vaala28
-rw-r--r--dvb-t/fi-Vaasa28
-rw-r--r--dvb-t/fi-Valtimo28
-rw-r--r--dvb-t/fi-Vammala_Jyranvuori37
-rw-r--r--dvb-t/fi-Vammala_Roismala28
-rw-r--r--dvb-t/fi-Vammala_Savi28
-rw-r--r--dvb-t/fi-Vantaa_Hakunila37
-rw-r--r--dvb-t/fi-Varpaisjarvi_Honkamaki37
-rw-r--r--dvb-t/fi-Virrat_Lappavuori37
-rw-r--r--dvb-t/fi-Vuokatti37
-rw-r--r--dvb-t/fi-Ylitornio_Ainiovaara28
-rw-r--r--dvb-t/fi-Ylitornio_Raanujarvi19
-rw-r--r--dvb-t/fi-Yllas19
-rw-r--r--dvb-t/fi-Yllasjarvi19
192 files changed, 832 insertions, 5023 deletions
diff --git a/dvb-t/fi-Aanekoski b/dvb-t/fi-Aanekoski
index a74e405f..7dda3262 100644
--- a/dvb-t/fi-Aanekoski
+++ b/dvb-t/fi-Aanekoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Aanekoski_Konginkangas b/dvb-t/fi-Aanekoski_Konginkangas
index 49a5dbc0..ff13741e 100644
--- a/dvb-t/fi-Aanekoski_Konginkangas
+++ b/dvb-t/fi-Aanekoski_Konginkangas
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ahtari b/dvb-t/fi-Ahtari
index a88bdcc9..aa90ea2d 100644
--- a/dvb-t/fi-Ahtari
+++ b/dvb-t/fi-Ahtari
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ahtari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ahtari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Alajarvi b/dvb-t/fi-Alajarvi
index 7f117f42..712483d1 100644
--- a/dvb-t/fi-Alajarvi
+++ b/dvb-t/fi-Alajarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Anjalankoski_Ruotila b/dvb-t/fi-Anjalankoski_Ruotila
index 7fb3b635..8ae12319 100644
--- a/dvb-t/fi-Anjalankoski_Ruotila
+++ b/dvb-t/fi-Anjalankoski_Ruotila
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Anjalankoski_Ruotila]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Enontekio_Ahovaara b/dvb-t/fi-Enontekio_Ahovaara
index 000ea591..21abdbc0 100644
--- a/dvb-t/fi-Enontekio_Ahovaara
+++ b/dvb-t/fi-Enontekio_Ahovaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Enontekio_Ahovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Enontekio_Ahovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Enontekio_Hetta b/dvb-t/fi-Enontekio_Hetta
index e55d2b31..6ff6b845 100644
--- a/dvb-t/fi-Enontekio_Hetta
+++ b/dvb-t/fi-Enontekio_Hetta
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Enontekio_Hetta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Enontekio_Hetta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Enontekio_Kuttanen b/dvb-t/fi-Enontekio_Kuttanen
index ccca087c..f9a6af82 100644
--- a/dvb-t/fi-Enontekio_Kuttanen
+++ b/dvb-t/fi-Enontekio_Kuttanen
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Enontekio_Kuttanen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Enontekio_Kuttanen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Espoo b/dvb-t/fi-Espoo
index 7b1ed6fd..03296aeb 100644
--- a/dvb-t/fi-Espoo
+++ b/dvb-t/fi-Espoo
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-# and addded new mux H
-[CHANNEL]
+
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Espoo]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Eurajoki b/dvb-t/fi-Eurajoki
index 4bae5a64..1d090a53 100644
--- a/dvb-t/fi-Eurajoki
+++ b/dvb-t/fi-Eurajoki
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Eurajoki]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Fiskars b/dvb-t/fi-Fiskars
index 938cf00d..0f84bb7a 100644
--- a/dvb-t/fi-Fiskars
+++ b/dvb-t/fi-Fiskars
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Haapavesi b/dvb-t/fi-Haapavesi
index d2ae4c68..8be1f62b 100644
--- a/dvb-t/fi-Haapavesi
+++ b/dvb-t/fi-Haapavesi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hameenkyro_Kyroskoski b/dvb-t/fi-Hameenkyro_Kyroskoski
index 1dc8b8bd..8a98791c 100644
--- a/dvb-t/fi-Hameenkyro_Kyroskoski
+++ b/dvb-t/fi-Hameenkyro_Kyroskoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hameenlinna_Painokangas b/dvb-t/fi-Hameenlinna_Painokangas
index 1302d294..9a56b2bb 100644
--- a/dvb-t/fi-Hameenlinna_Painokangas
+++ b/dvb-t/fi-Hameenlinna_Painokangas
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hameenlinna_Painokangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenlinna_Painokangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenlinna_Painokangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hanko b/dvb-t/fi-Hanko
index 5eb77890..ab08a142 100644
--- a/dvb-t/fi-Hanko
+++ b/dvb-t/fi-Hanko
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hartola b/dvb-t/fi-Hartola
index 4712253e..d10df22d 100644
--- a/dvb-t/fi-Hartola
+++ b/dvb-t/fi-Hartola
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hartola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hartola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hartola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Heinavesi b/dvb-t/fi-Heinavesi
index ee8ce95b..b33bb39e 100644
--- a/dvb-t/fi-Heinavesi
+++ b/dvb-t/fi-Heinavesi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Heinavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Heinola b/dvb-t/fi-Heinola
index 16796ca7..7a6f234e 100644
--- a/dvb-t/fi-Heinola
+++ b/dvb-t/fi-Heinola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyrynsalmi b/dvb-t/fi-Hyrynsalmi
index 3b798a2a..e11f89ac 100644
--- a/dvb-t/fi-Hyrynsalmi
+++ b/dvb-t/fi-Hyrynsalmi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyrynsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyrynsalmi_Kyparavaara b/dvb-t/fi-Hyrynsalmi_Kyparavaara
index 040b6a3c..f402d8af 100644
--- a/dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ b/dvb-t/fi-Hyrynsalmi_Kyparavaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyrynsalmi_Kyparavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Kyparavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Kyparavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyrynsalmi_Paljakka b/dvb-t/fi-Hyrynsalmi_Paljakka
index 50c70e37..806a3c09 100644
--- a/dvb-t/fi-Hyrynsalmi_Paljakka
+++ b/dvb-t/fi-Hyrynsalmi_Paljakka
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyrynsalmi_Paljakka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Paljakka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Paljakka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyvinkaa b/dvb-t/fi-Hyvinkaa
index ac299e6d..e711b16d 100644
--- a/dvb-t/fi-Hyvinkaa
+++ b/dvb-t/fi-Hyvinkaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ii_Raiskio b/dvb-t/fi-Ii_Raiskio
index 60bc0f12..c5fda678 100644
--- a/dvb-t/fi-Ii_Raiskio
+++ b/dvb-t/fi-Ii_Raiskio
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ii_Raiskio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ii_Raiskio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Iisalmi b/dvb-t/fi-Iisalmi
index b72a7bc1..d2818251 100644
--- a/dvb-t/fi-Iisalmi
+++ b/dvb-t/fi-Iisalmi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Iisalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Iisalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ikaalinen b/dvb-t/fi-Ikaalinen
index 2d7d87ae..885d44b5 100644
--- a/dvb-t/fi-Ikaalinen
+++ b/dvb-t/fi-Ikaalinen
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ikaalinen_Riitiala b/dvb-t/fi-Ikaalinen_Riitiala
index d6c9f2e0..55d82022 100644
--- a/dvb-t/fi-Ikaalinen_Riitiala
+++ b/dvb-t/fi-Ikaalinen_Riitiala
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Inari b/dvb-t/fi-Inari
index c8d8508d..31deb212 100644
--- a/dvb-t/fi-Inari
+++ b/dvb-t/fi-Inari
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Inari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Inari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Inari_Janispaa b/dvb-t/fi-Inari_Janispaa
index e02aaaaf..37bd31e2 100644
--- a/dvb-t/fi-Inari_Janispaa
+++ b/dvb-t/fi-Inari_Janispaa
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Inari_Janispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Inari_Janispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Inari_Naatamo b/dvb-t/fi-Inari_Naatamo
index 555a0c39..ba843609 100644
--- a/dvb-t/fi-Inari_Naatamo
+++ b/dvb-t/fi-Inari_Naatamo
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Inari_Naatamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Inari_Naatamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ivalo_Saarineitamovaara b/dvb-t/fi-Ivalo_Saarineitamovaara
index 1835ff5e..70181bbe 100644
--- a/dvb-t/fi-Ivalo_Saarineitamovaara
+++ b/dvb-t/fi-Ivalo_Saarineitamovaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ivalo_Saarineitamovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ivalo_Saarineitamovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jalasjarvi b/dvb-t/fi-Jalasjarvi
index 21bf3e17..9bc70582 100644
--- a/dvb-t/fi-Jalasjarvi
+++ b/dvb-t/fi-Jalasjarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Halli b/dvb-t/fi-Jamsa_Halli
index 10f74c5c..5d06520a 100644
--- a/dvb-t/fi-Jamsa_Halli
+++ b/dvb-t/fi-Jamsa_Halli
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Kaipola b/dvb-t/fi-Jamsa_Kaipola
index 46101608..ca8e563f 100644
--- a/dvb-t/fi-Jamsa_Kaipola
+++ b/dvb-t/fi-Jamsa_Kaipola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Matkosvuori b/dvb-t/fi-Jamsa_Matkosvuori
index 09505cbd..eacacff3 100644
--- a/dvb-t/fi-Jamsa_Matkosvuori
+++ b/dvb-t/fi-Jamsa_Matkosvuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Ouninpohja b/dvb-t/fi-Jamsa_Ouninpohja
index 38b22b84..70eb8e14 100644
--- a/dvb-t/fi-Jamsa_Ouninpohja
+++ b/dvb-t/fi-Jamsa_Ouninpohja
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Ouninpohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Ouninpohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Ouninpohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsankoski b/dvb-t/fi-Jamsankoski
index b9ff038a..142be917 100644
--- a/dvb-t/fi-Jamsankoski
+++ b/dvb-t/fi-Jamsankoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joensuu_Vestinkallio b/dvb-t/fi-Joensuu_Vestinkallio
index 858c41b2..765ba1ce 100644
--- a/dvb-t/fi-Joensuu_Vestinkallio
+++ b/dvb-t/fi-Joensuu_Vestinkallio
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joensuu_Vestinkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joensuu_Vestinkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joensuu_Vestinkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joroinen_Puukkola b/dvb-t/fi-Joroinen_Puukkola
index 1cc60c08..5fce8db4 100644
--- a/dvb-t/fi-Joroinen_Puukkola
+++ b/dvb-t/fi-Joroinen_Puukkola
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joroinen_Puukkola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joroinen_Puukkola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joroinen_Puukkola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joutsa_Lankia b/dvb-t/fi-Joutsa_Lankia
index b355e873..cc44c813 100644
--- a/dvb-t/fi-Joutsa_Lankia
+++ b/dvb-t/fi-Joutsa_Lankia
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joutseno b/dvb-t/fi-Joutseno
index b9013c7a..80337fc7 100644
--- a/dvb-t/fi-Joutseno
+++ b/dvb-t/fi-Joutseno
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Joutseno]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Juupajoki_Kopsamo b/dvb-t/fi-Juupajoki_Kopsamo
index aefc0906..a99af77e 100644
--- a/dvb-t/fi-Juupajoki_Kopsamo
+++ b/dvb-t/fi-Juupajoki_Kopsamo
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Juupajoki_Kopsamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juupajoki_Kopsamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juupajoki_Kopsamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Juva b/dvb-t/fi-Juva
index 8900203a..ab8a15e5 100644
--- a/dvb-t/fi-Juva
+++ b/dvb-t/fi-Juva
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jyvaskyla b/dvb-t/fi-Jyvaskyla
index 39fc33f2..3e2c51fa 100644
--- a/dvb-t/fi-Jyvaskyla
+++ b/dvb-t/fi-Jyvaskyla
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jyvaskyla_Vaajakoski b/dvb-t/fi-Jyvaskyla_Vaajakoski
index dff0fd3b..92b5ac96 100644
--- a/dvb-t/fi-Jyvaskyla_Vaajakoski
+++ b/dvb-t/fi-Jyvaskyla_Vaajakoski
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jyvaskyla_Vaajakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla_Vaajakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla_Vaajakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kaavi_Sivakkavaara b/dvb-t/fi-Kaavi_Sivakkavaara
index e400648a..7595a398 100644
--- a/dvb-t/fi-Kaavi_Sivakkavaara
+++ b/dvb-t/fi-Kaavi_Sivakkavaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kaavi_Sivakkavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kaavi_Sivakkavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kaavi_Sivakkavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kajaani_Pollyvaara b/dvb-t/fi-Kajaani_Pollyvaara
index 0442ba98..3ea7b90f 100644
--- a/dvb-t/fi-Kajaani_Pollyvaara
+++ b/dvb-t/fi-Kajaani_Pollyvaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kajaani_Pollyvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kajaani_Pollyvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kajaani_Pollyvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kalajoki b/dvb-t/fi-Kalajoki
index 3dfe323d..cab796dc 100644
--- a/dvb-t/fi-Kalajoki
+++ b/dvb-t/fi-Kalajoki
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kalajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kalajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kalajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kangaslampi b/dvb-t/fi-Kangaslampi
index d3647e22..d84b2a9e 100644
--- a/dvb-t/fi-Kangaslampi
+++ b/dvb-t/fi-Kangaslampi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kangasniemi_Turkinmaki b/dvb-t/fi-Kangasniemi_Turkinmaki
index a134e86b..56476e6b 100644
--- a/dvb-t/fi-Kangasniemi_Turkinmaki
+++ b/dvb-t/fi-Kangasniemi_Turkinmaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kankaanpaa b/dvb-t/fi-Kankaanpaa
index f6f982f0..a3df7ba5 100644
--- a/dvb-t/fi-Kankaanpaa
+++ b/dvb-t/fi-Kankaanpaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karigasniemi b/dvb-t/fi-Karigasniemi
index d6706a90..60548c72 100644
--- a/dvb-t/fi-Karigasniemi
+++ b/dvb-t/fi-Karigasniemi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karigasniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karigasniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karkkila b/dvb-t/fi-Karkkila
index d5796078..d598f471 100644
--- a/dvb-t/fi-Karkkila
+++ b/dvb-t/fi-Karkkila
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karstula b/dvb-t/fi-Karstula
index c625e004..dfd30016 100644
--- a/dvb-t/fi-Karstula
+++ b/dvb-t/fi-Karstula
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karstula]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karstula]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karstula]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karvia b/dvb-t/fi-Karvia
index 12bc970a..51e89b7b 100644
--- a/dvb-t/fi-Karvia
+++ b/dvb-t/fi-Karvia
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karvia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karvia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karvia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kaunispaa b/dvb-t/fi-Kaunispaa
index c8d8508d..e9fea9c7 100644
--- a/dvb-t/fi-Kaunispaa
+++ b/dvb-t/fi-Kaunispaa
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kaunispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kaunispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kemijarvi_Suomutunturi b/dvb-t/fi-Kemijarvi_Suomutunturi
index eb617319..dac5d932 100644
--- a/dvb-t/fi-Kemijarvi_Suomutunturi
+++ b/dvb-t/fi-Kemijarvi_Suomutunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kemijarvi_Suomutunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kemijarvi_Suomutunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kerimaki b/dvb-t/fi-Kerimaki
index ea8510eb..68f45d10 100644
--- a/dvb-t/fi-Kerimaki
+++ b/dvb-t/fi-Kerimaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Keuruu b/dvb-t/fi-Keuruu
index a08dab8a..dd49b5b6 100644
--- a/dvb-t/fi-Keuruu
+++ b/dvb-t/fi-Keuruu
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Keuruu_Haapamaki b/dvb-t/fi-Keuruu_Haapamaki
index f4e167fe..cfb9b0e2 100644
--- a/dvb-t/fi-Keuruu_Haapamaki
+++ b/dvb-t/fi-Keuruu_Haapamaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kihnio b/dvb-t/fi-Kihnio
index c8a961ec..7c5c9924 100644
--- a/dvb-t/fi-Kihnio
+++ b/dvb-t/fi-Kihnio
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kiihtelysvaara b/dvb-t/fi-Kiihtelysvaara
index d720c463..52e60b8e 100644
--- a/dvb-t/fi-Kiihtelysvaara
+++ b/dvb-t/fi-Kiihtelysvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kiihtelysvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kiihtelysvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kilpisjarvi b/dvb-t/fi-Kilpisjarvi
index abf73805..9d3435c4 100644
--- a/dvb-t/fi-Kilpisjarvi
+++ b/dvb-t/fi-Kilpisjarvi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kilpisjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kilpisjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kittila_Levitunturi b/dvb-t/fi-Kittila_Levitunturi
index 08ec326f..ae4c1c90 100644
--- a/dvb-t/fi-Kittila_Levitunturi
+++ b/dvb-t/fi-Kittila_Levitunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kittila_Levitunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kittila_Levitunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kolari_Vuolittaja b/dvb-t/fi-Kolari_Vuolittaja
index 787cfd4e..f507750a 100644
--- a/dvb-t/fi-Kolari_Vuolittaja
+++ b/dvb-t/fi-Kolari_Vuolittaja
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kolari_Vuolittaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kolari_Vuolittaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Koli b/dvb-t/fi-Koli
index 2076a7d9..034bf2d4 100644
--- a/dvb-t/fi-Koli
+++ b/dvb-t/fi-Koli
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Korpilahti_Vaarunvuori b/dvb-t/fi-Korpilahti_Vaarunvuori
index b9ff038a..7fa3ed65 100644
--- a/dvb-t/fi-Korpilahti_Vaarunvuori
+++ b/dvb-t/fi-Korpilahti_Vaarunvuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Korppoo b/dvb-t/fi-Korppoo
index 233138ea..6c842414 100644
--- a/dvb-t/fi-Korppoo
+++ b/dvb-t/fi-Korppoo
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kruunupyy b/dvb-t/fi-Kruunupyy
index 424e9033..65d86c4c 100644
--- a/dvb-t/fi-Kruunupyy
+++ b/dvb-t/fi-Kruunupyy
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Kruunupyy]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmo_Haukela b/dvb-t/fi-Kuhmo_Haukela
index 9ae57945..c3a3bd8b 100644
--- a/dvb-t/fi-Kuhmo_Haukela
+++ b/dvb-t/fi-Kuhmo_Haukela
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmo_Haukela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Haukela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Haukela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmo_Lentiira b/dvb-t/fi-Kuhmo_Lentiira
index 588463dc..11279993 100644
--- a/dvb-t/fi-Kuhmo_Lentiira
+++ b/dvb-t/fi-Kuhmo_Lentiira
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmo_Lentiira]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Lentiira]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Lentiira]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmo_Niva b/dvb-t/fi-Kuhmo_Niva
index 53a28c1f..6f7aa2cb 100644
--- a/dvb-t/fi-Kuhmo_Niva
+++ b/dvb-t/fi-Kuhmo_Niva
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmo_Niva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Niva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Niva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmoinen b/dvb-t/fi-Kuhmoinen
index 1c1b5d2a..53d2de9e 100644
--- a/dvb-t/fi-Kuhmoinen
+++ b/dvb-t/fi-Kuhmoinen
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmoinen_Harjunsalmi b/dvb-t/fi-Kuhmoinen_Harjunsalmi
index 1b370294..059df911 100644
--- a/dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ b/dvb-t/fi-Kuhmoinen_Harjunsalmi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmoinen_Puukkoinen b/dvb-t/fi-Kuhmoinen_Puukkoinen
index 5fbf978a..113e0f45 100644
--- a/dvb-t/fi-Kuhmoinen_Puukkoinen
+++ b/dvb-t/fi-Kuhmoinen_Puukkoinen
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmoinen_Puukkoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Puukkoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Puukkoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuopio b/dvb-t/fi-Kuopio
index 669e246d..eb39e5f0 100644
--- a/dvb-t/fi-Kuopio
+++ b/dvb-t/fi-Kuopio
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Kuopio]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kurikka_Kesti b/dvb-t/fi-Kurikka_Kesti
index 3ce29b6f..c34cfe62 100644
--- a/dvb-t/fi-Kurikka_Kesti
+++ b/dvb-t/fi-Kurikka_Kesti
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kustavi_Viherlahti b/dvb-t/fi-Kustavi_Viherlahti
index 3dd49338..ecef74dd 100644
--- a/dvb-t/fi-Kustavi_Viherlahti
+++ b/dvb-t/fi-Kustavi_Viherlahti
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuusamo_Hamppulampi b/dvb-t/fi-Kuusamo_Hamppulampi
index 89e20712..6ce9243a 100644
--- a/dvb-t/fi-Kuusamo_Hamppulampi
+++ b/dvb-t/fi-Kuusamo_Hamppulampi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuusamo_Hamppulampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuusamo_Hamppulampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kyyjarvi_Noposenaho b/dvb-t/fi-Kyyjarvi_Noposenaho
index 0ad6c3ae..d3deab81 100644
--- a/dvb-t/fi-Kyyjarvi_Noposenaho
+++ b/dvb-t/fi-Kyyjarvi_Noposenaho
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kyyjarvi_Noposenaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kyyjarvi_Noposenaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kyyjarvi_Noposenaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lahti b/dvb-t/fi-Lahti
index 6d96ea0e..d4bf4033 100644
--- a/dvb-t/fi-Lahti
+++ b/dvb-t/fi-Lahti
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Lahti]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lapua b/dvb-t/fi-Lapua
index 67d55288..9084440f 100644
--- a/dvb-t/fi-Lapua
+++ b/dvb-t/fi-Lapua
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Lapua]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Laukaa b/dvb-t/fi-Laukaa
index b9ff038a..3c484aeb 100644
--- a/dvb-t/fi-Laukaa
+++ b/dvb-t/fi-Laukaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Laukaa_Vihtavuori b/dvb-t/fi-Laukaa_Vihtavuori
index b9ff038a..5bc93a78 100644
--- a/dvb-t/fi-Laukaa_Vihtavuori
+++ b/dvb-t/fi-Laukaa_Vihtavuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lavia b/dvb-t/fi-Lavia
index 1e5a20d6..f2f13916 100644
--- a/dvb-t/fi-Lavia
+++ b/dvb-t/fi-Lavia
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Lavia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lavia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lavia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lohja b/dvb-t/fi-Lohja
index 7e4d94db..d040f9b4 100644
--- a/dvb-t/fi-Lohja
+++ b/dvb-t/fi-Lohja
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Loimaa b/dvb-t/fi-Loimaa
index 215521c6..0b6aad87 100644
--- a/dvb-t/fi-Loimaa
+++ b/dvb-t/fi-Loimaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Luhanka b/dvb-t/fi-Luhanka
index 3745545f..f6407ce3 100644
--- a/dvb-t/fi-Luhanka
+++ b/dvb-t/fi-Luhanka
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Luopioinen b/dvb-t/fi-Luopioinen
index 76173808..9ed4e3f2 100644
--- a/dvb-t/fi-Luopioinen
+++ b/dvb-t/fi-Luopioinen
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Mantta b/dvb-t/fi-Mantta
index 5c037350..e2014052 100644
--- a/dvb-t/fi-Mantta
+++ b/dvb-t/fi-Mantta
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Mantyharju b/dvb-t/fi-Mantyharju
index 6d13d6d4..3b7f127a 100644
--- a/dvb-t/fi-Mantyharju
+++ b/dvb-t/fi-Mantyharju
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Mantyharju]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantyharju]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantyharju]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Mikkeli b/dvb-t/fi-Mikkeli
index 4a2a9168..f523878c 100644
--- a/dvb-t/fi-Mikkeli
+++ b/dvb-t/fi-Mikkeli
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Muonio_Olostunturi b/dvb-t/fi-Muonio_Olostunturi
index 1099f56f..bfdf0c73 100644
--- a/dvb-t/fi-Muonio_Olostunturi
+++ b/dvb-t/fi-Muonio_Olostunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Muonio_Olostunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Muonio_Olostunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nilsia b/dvb-t/fi-Nilsia
index 2c1d030e..208d1c43 100644
--- a/dvb-t/fi-Nilsia
+++ b/dvb-t/fi-Nilsia
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nilsia_Keski-Siikajarvi b/dvb-t/fi-Nilsia_Keski-Siikajarvi
index 28eb1602..bfbc561a 100644
--- a/dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ b/dvb-t/fi-Nilsia_Keski-Siikajarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nilsia_Keski-Siikajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Keski-Siikajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Keski-Siikajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nilsia_Pisa b/dvb-t/fi-Nilsia_Pisa
index a4ad289b..8c8ee34f 100644
--- a/dvb-t/fi-Nilsia_Pisa
+++ b/dvb-t/fi-Nilsia_Pisa
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nilsia_Pisa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Pisa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Pisa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nokia b/dvb-t/fi-Nokia
index a9d4132e..2a2b3803 100644
--- a/dvb-t/fi-Nokia
+++ b/dvb-t/fi-Nokia
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nokia_Siuro b/dvb-t/fi-Nokia_Siuro
index a9d4132e..1ba3ccac 100644
--- a/dvb-t/fi-Nokia_Siuro
+++ b/dvb-t/fi-Nokia_Siuro
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nummi-Pusula_Hyonola b/dvb-t/fi-Nummi-Pusula_Hyonola
index d3aa9c44..08840cc3 100644
--- a/dvb-t/fi-Nummi-Pusula_Hyonola
+++ b/dvb-t/fi-Nummi-Pusula_Hyonola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nuorgam_Njallavaara b/dvb-t/fi-Nuorgam_Njallavaara
index c6797a3b..e1c1c3e0 100644
--- a/dvb-t/fi-Nuorgam_Njallavaara
+++ b/dvb-t/fi-Nuorgam_Njallavaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nuorgam_Njallavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nuorgam_Njallavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nuorgam_raja b/dvb-t/fi-Nuorgam_raja
index 8d9887b5..2b2cb3cd 100644
--- a/dvb-t/fi-Nuorgam_raja
+++ b/dvb-t/fi-Nuorgam_raja
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nuorgam_raja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nuorgam_raja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nurmes_Konnanvaara b/dvb-t/fi-Nurmes_Konnanvaara
index 1a921bd5..7cd3d91d 100644
--- a/dvb-t/fi-Nurmes_Konnanvaara
+++ b/dvb-t/fi-Nurmes_Konnanvaara
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nurmes_Kortevaara b/dvb-t/fi-Nurmes_Kortevaara
index 583b202a..3e118ad4 100644
--- a/dvb-t/fi-Nurmes_Kortevaara
+++ b/dvb-t/fi-Nurmes_Kortevaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nurmes_Kortevaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Kortevaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Kortevaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Orivesi_Talviainen b/dvb-t/fi-Orivesi_Talviainen
index a3d50ee9..149782ea 100644
--- a/dvb-t/fi-Orivesi_Talviainen
+++ b/dvb-t/fi-Orivesi_Talviainen
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Orivesi_Talviainen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Orivesi_Talviainen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Orivesi_Talviainen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Oulu b/dvb-t/fi-Oulu
index 7f754f94..6d108499 100644
--- a/dvb-t/fi-Oulu
+++ b/dvb-t/fi-Oulu
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Oulu]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Padasjoki b/dvb-t/fi-Padasjoki
index 9b6bdd17..47246b4b 100644
--- a/dvb-t/fi-Padasjoki
+++ b/dvb-t/fi-Padasjoki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Padasjoki_Arrakoski b/dvb-t/fi-Padasjoki_Arrakoski
index f8549f7c..c8c1b05b 100644
--- a/dvb-t/fi-Padasjoki_Arrakoski
+++ b/dvb-t/fi-Padasjoki_Arrakoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Paltamo_Kivesvaara b/dvb-t/fi-Paltamo_Kivesvaara
index aca37244..56f8ba05 100644
--- a/dvb-t/fi-Paltamo_Kivesvaara
+++ b/dvb-t/fi-Paltamo_Kivesvaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Paltamo_Kivesvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Paltamo_Kivesvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Paltamo_Kivesvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Parainen_Houtskari b/dvb-t/fi-Parainen_Houtskari
index 233138ea..e1878142 100644
--- a/dvb-t/fi-Parainen_Houtskari
+++ b/dvb-t/fi-Parainen_Houtskari
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Parikkala b/dvb-t/fi-Parikkala
index ab3cf80e..f0f52f7a 100644
--- a/dvb-t/fi-Parikkala
+++ b/dvb-t/fi-Parikkala
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Parkano_Sopukallio b/dvb-t/fi-Parkano_Sopukallio
index 362f20a6..62e85079 100644
--- a/dvb-t/fi-Parkano_Sopukallio
+++ b/dvb-t/fi-Parkano_Sopukallio
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pello b/dvb-t/fi-Pello
index d5ff22f3..2cbd28ec 100644
--- a/dvb-t/fi-Pello
+++ b/dvb-t/fi-Pello
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pello]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pello]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pello_Ratasvaara b/dvb-t/fi-Pello_Ratasvaara
index eae4a7e7..ff7f6607 100644
--- a/dvb-t/fi-Pello_Ratasvaara
+++ b/dvb-t/fi-Pello_Ratasvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pello_Ratasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pello_Ratasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Perho b/dvb-t/fi-Perho
index 82a0b8c0..0a7a2dc9 100644
--- a/dvb-t/fi-Perho
+++ b/dvb-t/fi-Perho
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pernaja b/dvb-t/fi-Pernaja
index a5eb6704..5459e885 100644
--- a/dvb-t/fi-Pernaja
+++ b/dvb-t/fi-Pernaja
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pernaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pernaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pernaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pieksamaki_Halkokumpu b/dvb-t/fi-Pieksamaki_Halkokumpu
index 19d2df98..f03f9a04 100644
--- a/dvb-t/fi-Pieksamaki_Halkokumpu
+++ b/dvb-t/fi-Pieksamaki_Halkokumpu
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pieksamaki_Halkokumpu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pieksamaki_Halkokumpu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pieksamaki_Halkokumpu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pihtipudas b/dvb-t/fi-Pihtipudas
index 6d336b7b..42cdd293 100644
--- a/dvb-t/fi-Pihtipudas
+++ b/dvb-t/fi-Pihtipudas
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pihtipudas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pihtipudas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pihtipudas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Porvoo_Suomenkyla b/dvb-t/fi-Porvoo_Suomenkyla
index b2f8e018..7b5e79df 100644
--- a/dvb-t/fi-Porvoo_Suomenkyla
+++ b/dvb-t/fi-Porvoo_Suomenkyla
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Posio b/dvb-t/fi-Posio
index 897f0130..02586479 100644
--- a/dvb-t/fi-Posio
+++ b/dvb-t/fi-Posio
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Posio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Posio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pudasjarvi b/dvb-t/fi-Pudasjarvi
index db4c846c..dc85d9ab 100644
--- a/dvb-t/fi-Pudasjarvi
+++ b/dvb-t/fi-Pudasjarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pudasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pudasjarvi_Iso-Syote b/dvb-t/fi-Pudasjarvi_Iso-Syote
index cec818bd..24cebddf 100644
--- a/dvb-t/fi-Pudasjarvi_Iso-Syote
+++ b/dvb-t/fi-Pudasjarvi_Iso-Syote
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pudasjarvi_Iso-Syote]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi_Iso-Syote]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi_Iso-Syote]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pudasjarvi_Kangasvaara b/dvb-t/fi-Pudasjarvi_Kangasvaara
index c58005f4..cb911634 100644
--- a/dvb-t/fi-Pudasjarvi_Kangasvaara
+++ b/dvb-t/fi-Pudasjarvi_Kangasvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pudasjarvi_Kangasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi_Kangasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Puolanka b/dvb-t/fi-Puolanka
index 804001ae..3370a9a6 100644
--- a/dvb-t/fi-Puolanka
+++ b/dvb-t/fi-Puolanka
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pyhatunturi b/dvb-t/fi-Pyhatunturi
index c15f4134..c5005761 100644
--- a/dvb-t/fi-Pyhatunturi
+++ b/dvb-t/fi-Pyhatunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pyhatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pyhatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pyhavuori b/dvb-t/fi-Pyhavuori
index 47c8268e..ad232654 100644
--- a/dvb-t/fi-Pyhavuori
+++ b/dvb-t/fi-Pyhavuori
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pyhavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pyhavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pyhavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pylkonmaki_Karankajarvi b/dvb-t/fi-Pylkonmaki_Karankajarvi
index 2bfe9761..2d7ef178 100644
--- a/dvb-t/fi-Pylkonmaki_Karankajarvi
+++ b/dvb-t/fi-Pylkonmaki_Karankajarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pylkonmaki_Karankajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pylkonmaki_Karankajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pylkonmaki_Karankajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Raahe_Mestauskallio b/dvb-t/fi-Raahe_Mestauskallio
index bc29a204..e4cc7b19 100644
--- a/dvb-t/fi-Raahe_Mestauskallio
+++ b/dvb-t/fi-Raahe_Mestauskallio
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Raahe_Piehinki b/dvb-t/fi-Raahe_Piehinki
index 535649d0..1b3836d9 100644
--- a/dvb-t/fi-Raahe_Piehinki
+++ b/dvb-t/fi-Raahe_Piehinki
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Raahe_Piehinki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Piehinki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Piehinki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ranua_Haasionmaa b/dvb-t/fi-Ranua_Haasionmaa
index 967aefef..837a10f3 100644
--- a/dvb-t/fi-Ranua_Haasionmaa
+++ b/dvb-t/fi-Ranua_Haasionmaa
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ranua_Haasionmaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ranua_Haasionmaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ranua_Leppiaho b/dvb-t/fi-Ranua_Leppiaho
index 0c2637f0..94d3eef7 100644
--- a/dvb-t/fi-Ranua_Leppiaho
+++ b/dvb-t/fi-Ranua_Leppiaho
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ranua_Leppiaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ranua_Leppiaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rautavaara_Angervikko b/dvb-t/fi-Rautavaara_Angervikko
index 30e66934..c89e4bf4 100644
--- a/dvb-t/fi-Rautavaara_Angervikko
+++ b/dvb-t/fi-Rautavaara_Angervikko
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rautjarvi_Simpele b/dvb-t/fi-Rautjarvi_Simpele
index 1460323b..2d4c254f 100644
--- a/dvb-t/fi-Rautjarvi_Simpele
+++ b/dvb-t/fi-Rautjarvi_Simpele
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rautjarvi_Simpele]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautjarvi_Simpele]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautjarvi_Simpele]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ristijarvi b/dvb-t/fi-Ristijarvi
index 08f92837..79a58c39 100644
--- a/dvb-t/fi-Ristijarvi
+++ b/dvb-t/fi-Ristijarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ristijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ristijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ristijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi b/dvb-t/fi-Rovaniemi
index 6028454b..87a65b17 100644
--- a/dvb-t/fi-Rovaniemi
+++ b/dvb-t/fi-Rovaniemi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Kaihuanvaara b/dvb-t/fi-Rovaniemi_Kaihuanvaara
index ff70c01c..3808ebc8 100644
--- a/dvb-t/fi-Rovaniemi_Kaihuanvaara
+++ b/dvb-t/fi-Rovaniemi_Kaihuanvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Kaihuanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Kaihuanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Karhuvaara b/dvb-t/fi-Rovaniemi_Karhuvaara
index 787cfd4e..069ecb4b 100644
--- a/dvb-t/fi-Rovaniemi_Karhuvaara
+++ b/dvb-t/fi-Rovaniemi_Karhuvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Karhuvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Karhuvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Marasenkallio b/dvb-t/fi-Rovaniemi_Marasenkallio
index a1006dff..6c8d5421 100644
--- a/dvb-t/fi-Rovaniemi_Marasenkallio
+++ b/dvb-t/fi-Rovaniemi_Marasenkallio
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Marasenkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Marasenkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Rantalaki b/dvb-t/fi-Rovaniemi_Rantalaki
index 42253393..fe3ea4c5 100644
--- a/dvb-t/fi-Rovaniemi_Rantalaki
+++ b/dvb-t/fi-Rovaniemi_Rantalaki
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Rantalaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Rantalaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Sonka b/dvb-t/fi-Rovaniemi_Sonka
index a1006dff..932b409c 100644
--- a/dvb-t/fi-Rovaniemi_Sonka
+++ b/dvb-t/fi-Rovaniemi_Sonka
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Sonka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Sonka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Sorviselka b/dvb-t/fi-Rovaniemi_Sorviselka
index 09d3f336..feb3bcf4 100644
--- a/dvb-t/fi-Rovaniemi_Sorviselka
+++ b/dvb-t/fi-Rovaniemi_Sorviselka
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Sorviselka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Sorviselka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ruka b/dvb-t/fi-Ruka
index 53c7c9b3..de41ddc7 100644
--- a/dvb-t/fi-Ruka
+++ b/dvb-t/fi-Ruka
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ruka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ruovesi_Storminiemi b/dvb-t/fi-Ruovesi_Storminiemi
index 1dc8b8bd..ac465cbf 100644
--- a/dvb-t/fi-Ruovesi_Storminiemi
+++ b/dvb-t/fi-Ruovesi_Storminiemi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Saarijarvi b/dvb-t/fi-Saarijarvi
index 5cd332d7..18c923f8 100644
--- a/dvb-t/fi-Saarijarvi
+++ b/dvb-t/fi-Saarijarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Saarijarvi_Kalmari b/dvb-t/fi-Saarijarvi_Kalmari
index 2bfe9761..77d5adeb 100644
--- a/dvb-t/fi-Saarijarvi_Kalmari
+++ b/dvb-t/fi-Saarijarvi_Kalmari
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Saarijarvi_Kalmari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Kalmari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Kalmari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Saarijarvi_Mahlu b/dvb-t/fi-Saarijarvi_Mahlu
index bfe350e1..48324d0e 100644
--- a/dvb-t/fi-Saarijarvi_Mahlu
+++ b/dvb-t/fi-Saarijarvi_Mahlu
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Saarijarvi_Mahlu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Mahlu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Mahlu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Hirvasvaara b/dvb-t/fi-Salla_Hirvasvaara
index a91b1ba1..e1410a0e 100644
--- a/dvb-t/fi-Salla_Hirvasvaara
+++ b/dvb-t/fi-Salla_Hirvasvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Hirvasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Hirvasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Ihistysjanka b/dvb-t/fi-Salla_Ihistysjanka
index accc619f..0d857b59 100644
--- a/dvb-t/fi-Salla_Ihistysjanka
+++ b/dvb-t/fi-Salla_Ihistysjanka
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Ihistysjanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Ihistysjanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Naruska b/dvb-t/fi-Salla_Naruska
index 43e17324..06bc1bab 100644
--- a/dvb-t/fi-Salla_Naruska
+++ b/dvb-t/fi-Salla_Naruska
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Naruska]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Naruska]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Sallatunturi b/dvb-t/fi-Salla_Sallatunturi
index b72a7bc1..54a55540 100644
--- a/dvb-t/fi-Salla_Sallatunturi
+++ b/dvb-t/fi-Salla_Sallatunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Sallatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Sallatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Sarivaara b/dvb-t/fi-Salla_Sarivaara
index b72a7bc1..eb9bbc0d 100644
--- a/dvb-t/fi-Salla_Sarivaara
+++ b/dvb-t/fi-Salla_Sarivaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Sarivaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Sarivaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salo_Isokyla b/dvb-t/fi-Salo_Isokyla
index 47eb1c3c..42df3b49 100644
--- a/dvb-t/fi-Salo_Isokyla
+++ b/dvb-t/fi-Salo_Isokyla
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Savukoski_Martti b/dvb-t/fi-Savukoski_Martti
index 86534b91..aafbdcbd 100644
--- a/dvb-t/fi-Savukoski_Martti
+++ b/dvb-t/fi-Savukoski_Martti
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Savukoski_Martti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Savukoski_Martti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Savukoski_Tanhua b/dvb-t/fi-Savukoski_Tanhua
index 7df1eb88..91f5fa75 100644
--- a/dvb-t/fi-Savukoski_Tanhua
+++ b/dvb-t/fi-Savukoski_Tanhua
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Savukoski_Tanhua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Savukoski_Tanhua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Siilinjarvi b/dvb-t/fi-Siilinjarvi
index e37b7079..7fc1f473 100644
--- a/dvb-t/fi-Siilinjarvi
+++ b/dvb-t/fi-Siilinjarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Simo_Viantie b/dvb-t/fi-Simo_Viantie
index f70ebaf1..580c7bdd 100644
--- a/dvb-t/fi-Simo_Viantie
+++ b/dvb-t/fi-Simo_Viantie
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Simo_Viantie]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Simo_Viantie]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Simo_Viantie]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sipoo_Norrkulla b/dvb-t/fi-Sipoo_Norrkulla
index c56023e4..abfb413d 100644
--- a/dvb-t/fi-Sipoo_Norrkulla
+++ b/dvb-t/fi-Sipoo_Norrkulla
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sodankyla_Pittiovaara b/dvb-t/fi-Sodankyla_Pittiovaara
index e20b23f3..a123f643 100644
--- a/dvb-t/fi-Sodankyla_Pittiovaara
+++ b/dvb-t/fi-Sodankyla_Pittiovaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sodankyla_Pittiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sodankyla_Pittiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sodankyla_Vuotso b/dvb-t/fi-Sodankyla_Vuotso
index 3924f17f..9c60b771 100644
--- a/dvb-t/fi-Sodankyla_Vuotso
+++ b/dvb-t/fi-Sodankyla_Vuotso
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sodankyla_Vuotso]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sodankyla_Vuotso]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sulkava_Vaatalanmaki b/dvb-t/fi-Sulkava_Vaatalanmaki
index 41b0dd11..31bdd61f 100644
--- a/dvb-t/fi-Sulkava_Vaatalanmaki
+++ b/dvb-t/fi-Sulkava_Vaatalanmaki
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sulkava_Vaatalanmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sulkava_Vaatalanmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sulkava_Vaatalanmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Ala-Vuokki b/dvb-t/fi-Suomussalmi_Ala-Vuokki
index 09fe6574..0878a88e 100644
--- a/dvb-t/fi-Suomussalmi_Ala-Vuokki
+++ b/dvb-t/fi-Suomussalmi_Ala-Vuokki
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Ala-Vuokki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Ala-Vuokki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Ammansaari b/dvb-t/fi-Suomussalmi_Ammansaari
index fcf1c0ab..9afcefff 100644
--- a/dvb-t/fi-Suomussalmi_Ammansaari
+++ b/dvb-t/fi-Suomussalmi_Ammansaari
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Ammansaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Ammansaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Juntusranta b/dvb-t/fi-Suomussalmi_Juntusranta
index fcf1c0ab..66c4e5b5 100644
--- a/dvb-t/fi-Suomussalmi_Juntusranta
+++ b/dvb-t/fi-Suomussalmi_Juntusranta
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Juntusranta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Juntusranta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Myllylahti b/dvb-t/fi-Suomussalmi_Myllylahti
index 3291e046..9630977d 100644
--- a/dvb-t/fi-Suomussalmi_Myllylahti
+++ b/dvb-t/fi-Suomussalmi_Myllylahti
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Myllylahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Myllylahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sysma_Liikola b/dvb-t/fi-Sysma_Liikola
index 2b6e7cbf..9db44246 100644
--- a/dvb-t/fi-Sysma_Liikola
+++ b/dvb-t/fi-Sysma_Liikola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Taivalkoski b/dvb-t/fi-Taivalkoski
index 510997a9..c307ae49 100644
--- a/dvb-t/fi-Taivalkoski
+++ b/dvb-t/fi-Taivalkoski
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Taivalkoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Taivalkoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Taivalkoski_Taivalvaara b/dvb-t/fi-Taivalkoski_Taivalvaara
index fe0a6cb8..ff81bf02 100644
--- a/dvb-t/fi-Taivalkoski_Taivalvaara
+++ b/dvb-t/fi-Taivalkoski_Taivalvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Taivalkoski_Taivalvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Taivalkoski_Taivalvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tammela b/dvb-t/fi-Tammela
index ddf6d975..f537bef2 100644
--- a/dvb-t/fi-Tammela
+++ b/dvb-t/fi-Tammela
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Tammela]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tammisaari b/dvb-t/fi-Tammisaari
index 1bfa8e0f..5248fd22 100644
--- a/dvb-t/fi-Tammisaari
+++ b/dvb-t/fi-Tammisaari
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tampere b/dvb-t/fi-Tampere
index 88f2d1c2..1440032d 100644
--- a/dvb-t/fi-Tampere
+++ b/dvb-t/fi-Tampere
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Tampere]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tampere_Pyynikki b/dvb-t/fi-Tampere_Pyynikki
index fd700d3f..03e8ecca 100644
--- a/dvb-t/fi-Tampere_Pyynikki
+++ b/dvb-t/fi-Tampere_Pyynikki
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Tampere_Pyynikki]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tervola b/dvb-t/fi-Tervola
index 57bc2217..d2c2d949 100644
--- a/dvb-t/fi-Tervola
+++ b/dvb-t/fi-Tervola
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tervola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tervola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tervola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Turku b/dvb-t/fi-Turku
index a5d1844d..281048d4 100644
--- a/dvb-t/fi-Turku
+++ b/dvb-t/fi-Turku
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Turku]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki b/dvb-t/fi-Utsjoki
index 0f06f422..b884a17a 100644
--- a/dvb-t/fi-Utsjoki
+++ b/dvb-t/fi-Utsjoki
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Nuvvus b/dvb-t/fi-Utsjoki_Nuvvus
index a240a988..66d35a3a 100644
--- a/dvb-t/fi-Utsjoki_Nuvvus
+++ b/dvb-t/fi-Utsjoki_Nuvvus
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Nuvvus]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Nuvvus]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Outakoski b/dvb-t/fi-Utsjoki_Outakoski
index d6706a90..53a75af8 100644
--- a/dvb-t/fi-Utsjoki_Outakoski
+++ b/dvb-t/fi-Utsjoki_Outakoski
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Outakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Outakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Polvarniemi b/dvb-t/fi-Utsjoki_Polvarniemi
index d6706a90..0ee4cebd 100644
--- a/dvb-t/fi-Utsjoki_Polvarniemi
+++ b/dvb-t/fi-Utsjoki_Polvarniemi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Polvarniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Polvarniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Rovisuvanto b/dvb-t/fi-Utsjoki_Rovisuvanto
index 3483896c..7459a8d6 100644
--- a/dvb-t/fi-Utsjoki_Rovisuvanto
+++ b/dvb-t/fi-Utsjoki_Rovisuvanto
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Rovisuvanto]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Rovisuvanto]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Tenola b/dvb-t/fi-Utsjoki_Tenola
index 663f5906..96504393 100644
--- a/dvb-t/fi-Utsjoki_Tenola
+++ b/dvb-t/fi-Utsjoki_Tenola
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Tenola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Tenola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Uusikaupunki_Orivo b/dvb-t/fi-Uusikaupunki_Orivo
index 429ed608..abe1f7f1 100644
--- a/dvb-t/fi-Uusikaupunki_Orivo
+++ b/dvb-t/fi-Uusikaupunki_Orivo
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vaala b/dvb-t/fi-Vaala
index 4b335719..86e87732 100644
--- a/dvb-t/fi-Vaala
+++ b/dvb-t/fi-Vaala
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vaala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vaasa b/dvb-t/fi-Vaasa
index a952ade5..7826313c 100644
--- a/dvb-t/fi-Vaasa
+++ b/dvb-t/fi-Vaasa
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vaasa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaasa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaasa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Valtimo b/dvb-t/fi-Valtimo
index 131e4083..81e82455 100644
--- a/dvb-t/fi-Valtimo
+++ b/dvb-t/fi-Valtimo
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Valtimo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Valtimo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Valtimo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vammala_Jyranvuori b/dvb-t/fi-Vammala_Jyranvuori
index edd55f01..26582a83 100644
--- a/dvb-t/fi-Vammala_Jyranvuori
+++ b/dvb-t/fi-Vammala_Jyranvuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vammala_Roismala b/dvb-t/fi-Vammala_Roismala
index 1f3446d2..53f37934 100644
--- a/dvb-t/fi-Vammala_Roismala
+++ b/dvb-t/fi-Vammala_Roismala
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vammala_Roismala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Roismala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Roismala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vammala_Savi b/dvb-t/fi-Vammala_Savi
index 036fa009..189afb4a 100644
--- a/dvb-t/fi-Vammala_Savi
+++ b/dvb-t/fi-Vammala_Savi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vammala_Savi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Savi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Savi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vantaa_Hakunila b/dvb-t/fi-Vantaa_Hakunila
index f18657ce..af493a1d 100644
--- a/dvb-t/fi-Vantaa_Hakunila
+++ b/dvb-t/fi-Vantaa_Hakunila
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Varpaisjarvi_Honkamaki b/dvb-t/fi-Varpaisjarvi_Honkamaki
index 60c276ec..5bdf9742 100644
--- a/dvb-t/fi-Varpaisjarvi_Honkamaki
+++ b/dvb-t/fi-Varpaisjarvi_Honkamaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Virrat_Lappavuori b/dvb-t/fi-Virrat_Lappavuori
index b1c8c285..61f12b0b 100644
--- a/dvb-t/fi-Virrat_Lappavuori
+++ b/dvb-t/fi-Virrat_Lappavuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vuokatti b/dvb-t/fi-Vuokatti
index db1af70c..5a78cf36 100644
--- a/dvb-t/fi-Vuokatti
+++ b/dvb-t/fi-Vuokatti
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ylitornio_Ainiovaara b/dvb-t/fi-Ylitornio_Ainiovaara
index a2a8d96c..ebd72b90 100644
--- a/dvb-t/fi-Ylitornio_Ainiovaara
+++ b/dvb-t/fi-Ylitornio_Ainiovaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ylitornio_Ainiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ylitornio_Ainiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ylitornio_Ainiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ylitornio_Raanujarvi b/dvb-t/fi-Ylitornio_Raanujarvi
index c7bac5ad..885c18f5 100644
--- a/dvb-t/fi-Ylitornio_Raanujarvi
+++ b/dvb-t/fi-Ylitornio_Raanujarvi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ylitornio_Raanujarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ylitornio_Raanujarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Yllas b/dvb-t/fi-Yllas
index d5ff22f3..0488cfb8 100644
--- a/dvb-t/fi-Yllas
+++ b/dvb-t/fi-Yllas
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Yllas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Yllas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Yllasjarvi b/dvb-t/fi-Yllasjarvi
index 889c588c..67900896 100644
--- a/dvb-t/fi-Yllasjarvi
+++ b/dvb-t/fi-Yllasjarvi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Yllasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Yllasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO