Imported Upstream version 0+git20151202.3864e0aupstream/0+git20151202.3864e0a

1 files changed, 40 insertions, 96 deletions

diff --git a/dvb-c/fi-HTV b/dvb-c/fi-HTV
index d23d93b..9b69de6 100644
--- a/dvb-c/fi-HTV
+++ b/dvb-c/fi-HTV
@@ -1,16 +1,9 @@
-# HTV
-# freq sr fec mod
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 274000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/128
-	INVERSION = AUTO
+# Generated from http://dvb.welho.fi/hel5-sidump1.xml
+# 2016-01-06 15:42:32.073637
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 282000000
+	FREQUENCY = 274000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/128
@@ -18,18 +11,10 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 162000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/64
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 170000000
+	FREQUENCY = 250000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -37,55 +22,55 @@
 	FREQUENCY = 290000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 146000000
+	FREQUENCY = 298000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 154000000
+	FREQUENCY = 306000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 138000000
+	FREQUENCY = 314000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 266000000
+	FREQUENCY = 322000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 362000000
+	FREQUENCY = 338000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 298000000
+	FREQUENCY = 346000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -93,31 +78,31 @@
 	FREQUENCY = 354000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 370000000
+	FREQUENCY = 362000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 378000000
+	FREQUENCY = 370000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 394000000
+	FREQUENCY = 378000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -125,52 +110,20 @@
 	FREQUENCY = 386000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 258000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/128
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 250000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/128
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 314000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/128
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 306000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/64
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 322000000
+	FREQUENCY = 394000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 330000000
+	FREQUENCY = 178000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -178,7 +131,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 338000000
+	FREQUENCY = 186000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -186,15 +139,15 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 346000000
+	FREQUENCY = 194000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
-	MODULATION = QAM/128
+	MODULATION = QAM/256
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 234000000
+	FREQUENCY = 202000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -226,15 +179,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 178000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/256
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 186000000
+	FREQUENCY = 242000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -242,7 +187,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 194000000
+	FREQUENCY = 258000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -250,7 +195,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 202000000
+	FREQUENCY = 266000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -258,7 +203,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 514000000
+	FREQUENCY = 162000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -266,7 +211,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 522000000
+	FREQUENCY = 154000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -274,7 +219,7 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 530000000
+	FREQUENCY = 146000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
@@ -282,9 +227,8 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 554000000
+	FREQUENCY = 170000000
 	SYMBOL_RATE = 6900000
 	INNER_FEC = NONE
 	MODULATION = QAM/256
 	INVERSION = AUTO
-