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-Redruth | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

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

diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index 8f15fa02..a05849c5 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -1,13 +1,15 @@
-# UK, Redruth
-# 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 8k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 650167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Redruth
+# date (yyyy-mm-dd)    : 2013-09-18
+#
+# T[2] <freq>     <bw>  <fec_hi> <fec_lo> <mod>   <tm> <guard> <hi> [<plp_id>] [# comment]
+#----------------------------------------------------------------------------------------------
+T       658167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
+T       634167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
+T2      682000000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
+T       690000000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
+T       722000000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
+T       714000000  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-Redruth | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index a05849c5..641ed924 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -5,11 +5,11 @@
 # location and provider: UK, Redruth
 # 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       658167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
-T       634167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
-T2      682000000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
-T       690000000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
-T       722000000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
-T       714000000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM6
+T  658167000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB1
+T  634167000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T  690000000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM4
+T  722000000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM5
+T  714000000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM6
-- 
cgit v1.2.3