New upstream version 0+git20161227.ac7535aupstream/0+git20161227.ac7535a

8 files changed, 1794 insertions, 81 deletions

diff --git a/dvb-t/au-Goulburn-Rocky_Hill b/dvb-t/au-Goulburn-Rocky_Hill
index 2165655..259d9ea 100644
--- a/dvb-t/au-Goulburn-Rocky_Hill
+++ b/dvb-t/au-Goulburn-Rocky_Hill
@@ -1,73 +1,664 @@
 # Australia / Goulburn / Rocky Hill
 #
-# Scanned 17/10/2009 - Alex Ferrara (alex@receptiveit.com.au)
+# Scanned 31/07/2016 - Alex Ferrara (alex@receptiveit.com.au)
 
-# ABC - netid (4112) tid (547) offset (+125Khz)
-[CHANNEL]
+[Nine Canberra]
+	SERVICE_ID = 2055
+	VIDEO_PID = 353
+	AUDIO_PID = 354
+	PID_0b = 8026
+	PID_06 = 355
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9HD Canberra]
+	SERVICE_ID = 2247
+	VIDEO_PID = 1761
+	AUDIO_PID = 1762 1763 8025
+	PID_0b = 8026
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[Nine Canberra]
+	SERVICE_ID = 2215
+	VIDEO_PID = 353
+	AUDIO_PID = 354
+	PID_0b = 8026
+	PID_06 = 355
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9Gem]
+	SERVICE_ID = 2087
+	VIDEO_PID = 1711
+	AUDIO_PID = 1712
+	PID_0b = 8026
+	PID_06 = 1713
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9Go!]
+	SERVICE_ID = 2119
+	VIDEO_PID = 1721
+	AUDIO_PID = 1722
+	PID_0b = 8026
+	PID_06 = 1723
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9Life]
+	SERVICE_ID = 2279
+	VIDEO_PID = 1771
+	AUDIO_PID = 1772
+	PID_0b = 8026
+	PID_06 = 1773
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[YESSHOP]
+	SERVICE_ID = 2151
+	VIDEO_PID = 1731
+	AUDIO_PID = 1732
+	PID_0b = 8026
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[Aspire]
+	SERVICE_ID = 2183
+	VIDEO_PID = 1741
+	AUDIO_PID = 1742
+	PID_0b = 8026
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+	SERVICE_ID = 1921
+	VIDEO_PID = 122
+	AUDIO_PID = 522
+	PID_0b = 102
+	PID_06 = 722
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra HD]
+	SERVICE_ID = 1939
+	VIDEO_PID = 125
+	AUDIO_PID = 525 725
+	PID_0b = 102
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+	SERVICE_ID = 1922
+	VIDEO_PID = 123
+	AUDIO_PID = 523
+	PID_0b = 102
+	PID_06 = 723
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ELEVEN Canberra]
+	SERVICE_ID = 1926
+	VIDEO_PID = 124
+	AUDIO_PID = 524
+	PID_0b = 102
+	PID_06 = 724
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN NETWORK]
+	SERVICE_ID = 1936
+	VIDEO_PID = 126
+	AUDIO_PID = 526
+	PID_0b = 102
+	PID_06 = 726
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[TVSN]
+	SERVICE_ID = 1928
+	VIDEO_PID = 116
+	AUDIO_PID = 516
+	PID_0b = 102
+	PID_06 = 716
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[GOLD]
+	SERVICE_ID = 1927
+	VIDEO_PID = 115
+	AUDIO_PID = 515
+	PID_0b = 102
+	PID_06 = 715
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+	SERVICE_ID = 1925
+	VIDEO_PID = 123
+	AUDIO_PID = 523
+	PID_0b = 102
+	PID_06 = 723
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+	SERVICE_ID = 1924
+	VIDEO_PID = 122
+	AUDIO_PID = 522
+	PID_0b = 102
+	PID_06 = 722
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 725625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[PRIME7 Canberra]
+	SERVICE_ID = 2374
+	VIDEO_PID = 2740
+	AUDIO_PID = 2741
+	PID_0b = 2749
+	PID_06 = 2745
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+	SERVICE_ID = 2400
+	VIDEO_PID = 2740
+	AUDIO_PID = 2741
+	PID_0b = 2749
+	PID_06 = 2745
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[PRIME7 Canberra]
+	SERVICE_ID = 2401
+	VIDEO_PID = 2740
+	AUDIO_PID = 2741
+	PID_0b = 2749
+	PID_06 = 2745
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# SBS - netid (12802) tid (848) offset (+125Khz)
-[CHANNEL]
+[7TWO Canberra]
+	SERVICE_ID = 2402
+	VIDEO_PID = 4620
+	AUDIO_PID = 4621
+	PID_0b = 2749
+	PID_06 = 4625
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 746625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
+
+[7mate Canberra]
+	SERVICE_ID = 2403
+	VIDEO_PID = 4630
+	AUDIO_PID = 4632 4635
+	PID_0b = 2749
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ishoptv]
+	SERVICE_ID = 2405
+	VIDEO_PID = 4650
+	AUDIO_PID = 4651
+	PID_0b = 2749
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[RACING.COM]
+	SERVICE_ID = 2408
+	VIDEO_PID = 4680
+	AUDIO_PID = 4681
+	PID_0b = 2749
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC News 24]
+	SERVICE_ID = 672
+	VIDEO_PID = 516
+	AUDIO_PID = 654 580 5500
+	PID_0b = 5501 5000
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC]
+	SERVICE_ID = 673
+	VIDEO_PID = 512
+	AUDIO_PID = 650
+	PID_0b = 5501 5000
+	PID_06 = 576
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC2/KIDS]
+	SERVICE_ID = 674
+	VIDEO_PID = 513
+	AUDIO_PID = 651
+	PID_0b = 5501 5000
+	PID_06 = 577
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[ABC]
+	SERVICE_ID = 675
+	VIDEO_PID = 512
+	AUDIO_PID = 650
+	PID_0b = 5501 5000
+	PID_06 = 576
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# WIN - netid (12915) tid (12922) offset (+125Khz)
-[CHANNEL]
+[ABC3]
+	SERVICE_ID = 676
+	VIDEO_PID = 514
+	AUDIO_PID = 652
+	PID_0b = 5501 5000
+	PID_06 = 578
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 767625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[Double J]
+	SERVICE_ID = 678
+	AUDIO_PID = 690
+	PID_0b = 5501
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC Jazz]
+	SERVICE_ID = 679
+	AUDIO_PID = 700
+	PID_0b = 5501
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[SBS ONE]
+	SERVICE_ID = 849
+	VIDEO_PID = 161
+	AUDIO_PID = 81
+	PID_0b = 7000 5000
+	PID_06 = 41
+	PID_05 = 7849
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# Prime - netid (12929) tid (2462) offset (+125Khz)
-[CHANNEL]
+[SBS HD]
+	SERVICE_ID = 853
+	VIDEO_PID = 102
+	AUDIO_PID = 103
+	PID_0b = 7000 5000
+	PID_06 = 43
+	PID_05 = 7853
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 788625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[SBS TWO]
+	SERVICE_ID = 850
+	VIDEO_PID = 162
+	AUDIO_PID = 83
+	PID_0b = 7000 5000
+	PID_06 = 42
+	PID_05 = 7850
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[Food Network]
+	SERVICE_ID = 851
+	VIDEO_PID = 163
+	AUDIO_PID = 85
+	PID_0b = 7000 5000
+	PID_06 = 44
+	PID_05 = 7849
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[NITV]
+	SERVICE_ID = 852
+	VIDEO_PID = 164
+	AUDIO_PID = 87
+	PID_0b = 7000 5000
+	PID_06 = 45
+	PID_05 = 7852
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# TEN - netid (12812) tid (2055) offset (0Khz)
-[CHANNEL]
+[SBS Radio 1]
+	SERVICE_ID = 862
+	AUDIO_PID = 201
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 809500000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[SBS Radio 2]
+	SERVICE_ID = 863
+	AUDIO_PID = 202
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 3]
+	SERVICE_ID = 864
+	AUDIO_PID = 203
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
diff --git a/dvb-t/es-Almeria b/dvb-t/es-Almeria
new file mode 100644
index 0000000..a6481e6
--- /dev/null
+++ b/dvb-t/es-Almeria
@@ -0,0 +1,108 @@
+# Spain, Almeria - Update 2016/03/17 (denise_amiga)
+[Canal 34: Interalmeria TV, 8TV, Tubienstar Astrocanal, Canal 28]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 36: Atreseries HD, Energy HD, Real Madrid TV]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 38: Boing, Energy, Mega, 13TV, Onda Cero, Europa FM, Melodia FM, Cope]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 41: Antena 3, Antena 3HD, laSexta, laSecta HD, Neox, Nova]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 44: Telecinco, Telecinco HD, Cuatro, Cuatro HD, FDF, Divinity]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 47: TDP, TDP HD 9Kiss TV, 10, Radio Clasica HQ, Radio 3 HQ, Radio Exterior RNE Kiss FM, Canal Ingenieria]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 57: La 1, La 1 HD, La 2, 24h, Clan, Radio, Radio 5]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 58: 13TV, Discovery MAX, Disney Channel, Paramount Channel, Cope, Radio Maria, Radio Marca, Vaughan Radio, esRadio, Guide Plus+]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 59: Canal Sur, Canal Sur 2, Andalucia TV, EHS TV, Canal Sur Radio, Flamenco Radio, Canal Fiesta Radio, Radio Andalucia Informacion]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
diff --git a/dvb-t/es-Asturias b/dvb-t/es-Asturias
index f163d4b..283b912 100644
--- a/dvb-t/es-Asturias
+++ b/dvb-t/es-Asturias
@@ -1,7 +1,7 @@
 # DVB-T Asturias
-[TPA TPA2]
+[Canal 22: Atreseries HD, Energy HD, Real Madrid TV, Be Mad]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 786000000
+	FREQUENCY = 482000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -11,9 +11,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3]
+# START CANGAS DE NARCEA Y LLANES
+[Canal 25: Ed. Prensa Asturiana, TeleNarcea, TeleAvilés, UTE Opalo]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 818000000
+	FREQUENCY = 506000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -22,10 +23,11 @@
 	GUARD_INTERVAL = 1/4
 	HIERARCHY = NONE
 	INVERSION = AUTO
+# END CANGAS DE NARCEA Y LLANES
 
-[TELEDEPORTE, VEO TV, VEO 2, NET TV]
+[Canal 27: Boing, Energy, Mega, 13 TV, Onda Cero, Europa FM, Melodía FM, Cope]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 834000000
+	FREQUENCY = 522000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -35,9 +37,9 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[CUATRO, CNN+, 40 LATINO, LA SEXTA 1]
+[Canal 28: Telecinco, Telecinco HD, Cuatro, Cuatro HD, FDF, Divinity]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 842000000
+	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -47,9 +49,9 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC]
+[Canal 32: Antena 3, Antena 3 HD, laSexta, laSexta HD, Neox, Nova]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 850000000
+	FREQUENCY = 562000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -59,9 +61,9 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2]
+[Canal 35: Proximamente, Discovery Max, Disney Channel, Paramount Channel, Cope, Radio María, Radio Marca, Vaughan Radio, esRadio]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 858000000
+	FREQUENCY = 586000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -71,3 +73,122 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+# START GIJÓN
+[Canal 38: Muy Muy TV, Canal 10, Astrocanal]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END GIJÓN
+
+[Canal 39: La 1, La 1 HD, La 2, 24h, Clan, Radio Nacional, Radio 5]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 42: TDP, TDP HD, KISS, TEN, Radio Clásica HQ, Radio 3 HQ, Radio Exterior RNE, Kiss FM]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# START OVIEDO
+[Canal 43: Ed. Prensa Asturiana, Oviedo TV, Canal 10]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END OVIEDO
+
+# START INFIESTO
+[Canal 44: Ed. Prensa Asturiana, TeleAvilés, UTE Opalo]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END INFIESTO
+
+[Canal 45: TPA7, TPA8, TPA HD, RPA, Radio Langreo]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# START MIERES
+[Canal 46: Cuencas Mineras TV, Producciones Grela]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END MIERES
+
+# START AVILÉS
+[Canal 47: Ed. Prensa Asturiana, Canal 10, TeleAvilés]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END AVILÉS
+
+# START LUARCA-VALDÉS
+[Canal 56: Ed. Prensa Asturiana, TeleAvilés, ORT]
+	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/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END LUARCA-VALDÉS
diff --git a/dvb-t/pl-Krosno_Sucha_Gora b/dvb-t/pl-Krosno_Sucha_Gora
new file mode 100644
index 0000000..cb4e92d
--- /dev/null
+++ b/dvb-t/pl-Krosno_Sucha_Gora
@@ -0,0 +1,35 @@
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
diff --git a/dvb-t/pl-Warszawa b/dvb-t/pl-Warszawa
new file mode 100644
index 0000000..e6c6b3e
--- /dev/null
+++ b/dvb-t/pl-Warszawa
@@ -0,0 +1,64 @@
+# Warsaw (Masowian), Poland
+#
+# Channels info: http://sat-charts.eu/dvb-t.php
+#
+[Raszyn/PKiN MUX-3]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Raszyn/PKiN MUX-8 (TVNHD)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Raszyn/PKiN MUX-1]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Raszyn/PKiN MUX-2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[PKiN MUX-8]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/ru-Vladivostok b/dvb-t/ru-Vladivostok
new file mode 100644
index 0000000..997838f
--- /dev/null
+++ b/dvb-t/ru-Vladivostok
@@ -0,0 +1,54 @@
+# Channel ranges for DVB-T2 in Vladivostok - Russia
+# Contributed by: Придворов Андрей "(Pridvorov Andrey)" <ua0lnj@bk.ru>
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 1
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 2
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
diff --git a/dvb-t/ru-all b/dvb-t/ru-all
new file mode 100644
index 0000000..070355f
--- /dev/null
+++ b/dvb-t/ru-all
@@ -0,0 +1,730 @@
+# Channel ranges for DVB-T2 in Russia
+# Contributed by: Придворов Андрей "(Pridvorov Andrey)" <ua0lnj@bk.ru>
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 178000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 186000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 194000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 202000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 210000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 218000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 226000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 794000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 802000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 810000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 818000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 826000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 834000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 842000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 850000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 858000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
diff --git a/dvb-t/ug-All b/dvb-t/ug-All
index ce2a286..2d29959 100644
--- a/dvb-t/ug-All
+++ b/dvb-t/ug-All
@@ -1,45 +1,55 @@
 # location and provider	: Kampala-Uganda
-# date			: 2013-11-01
+# date			: 2016-10-07
 # provided by		: Joseph Zikusooka
 # 	               	: http://joseph.zikusooka.com
-# 	               	: joseph@zikusooka.com
+# 	               	: josephzik@gmail.com
 #
 #------------------------------------------------------------------------------
-[UCC Primary]
-	DELIVERY_SYSTEM = DVBT
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	FREQUENCY = 474000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
+	CODE_RATE_HP = 1/2
 	CODE_RATE_LP = NONE
 	MODULATION = QPSK
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 538000000
+	FREQUENCY = 594000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = AUTO
-	CODE_RATE_LP = AUTO
-	MODULATION = QAM/AUTO
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = AUTO
-	STREAM_ID = 1
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 586000000
+	FREQUENCY = 714000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = AUTO
-	CODE_RATE_LP = AUTO
-	MODULATION = QAM/AUTO
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = AUTO
-	STREAM_ID = 9
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO