From cc90cb7196440a88e2a7987203152910049e266d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 5 Sep 2014 15:10:06 -0300 Subject: 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 --- dvb-t/fi-Tampere | 65 ++++++++------------------------------------------------ 1 file changed, 9 insertions(+), 56 deletions(-) (limited to 'dvb-t/fi-Tampere') 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 -# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$ -# and addded new mux H -[CHANNEL] +# 2014-04-18 Antti Palosaari +# 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 -- cgit v1.2.3