From 8bb3bbe2cfb1dd2b85c278f9da3cb2b80a2b5f5b Mon Sep 17 00:00:00 2001
From: silid <simon@liddicott.com>
Date: Wed, 18 Sep 2013 14:40:58 +0100
Subject: Update UK DVB-T settings

Update includes national muxes from
<http://www.ofcom.org.uk/static/broadcasting/National-Muxes.csv> Renames
three files to match Ofcom names.
---
 dvb-t/uk-Aberdare | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'dvb-t/uk-Aberdare')

diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 1676d8da..6887696e 100644
--- a/dvb-t/uk-Aberdare
+++ b/dvb-t/uk-Aberdare
@@ -1,15 +1,15 @@
-# UK, Aberdare
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 474167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-
-
-#C21+	C22+	C24-	C25+	C27-	C28+
-
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Aberdare
+# date (yyyy-mm-dd)    : 2013-09-18
+#
+# T[2] <freq>     <bw>  <fec_hi> <fec_lo> <mod>   <tm> <guard> <hi> [<plp_id>] [# comment]
+#----------------------------------------------------------------------------------------------
+T       497833000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
+T       474167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
+T2      521833000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
+T       506167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
+T       482167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
+T       530167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM6
-- 
cgit v1.2.3


From 832df4f9999018edfee2d304553b1ed8b7b42bd7 Mon Sep 17 00:00:00 2001
From: silid <simon@liddicott.com>
Date: Wed, 18 Sep 2013 21:03:05 +0100
Subject: Removal of excess white space

---
 dvb-t/uk-Aberdare | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'dvb-t/uk-Aberdare')

diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 6887696e..a43837c7 100644
--- a/dvb-t/uk-Aberdare
+++ b/dvb-t/uk-Aberdare
@@ -5,11 +5,11 @@
 # location and provider: UK, Aberdare
 # date (yyyy-mm-dd)    : 2013-09-18
 #
-# T[2] <freq>     <bw>  <fec_hi> <fec_lo> <mod>   <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
 #----------------------------------------------------------------------------------------------
-T       497833000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
-T       474167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
-T2      521833000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
-T       506167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
-T       482167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
-T       530167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM6
+T  497833000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB1
+T  474167000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB2
+T2 521833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T  506167000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM4
+T  482167000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM5
+T  530167000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM6
-- 
cgit v1.2.3