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-StocklandHill | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

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

diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
index f89a86d4..cd2c5887 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -1,9 +1,15 @@
-# UK, Stockland Hill
-# http://www.ukfree.tv/txdetail.php?a=ST222014
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB1
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB2
-#T 538167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB3 (DVB-T2)
-T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM4
-T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM5
-T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM6
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Stockland Hill
+# date (yyyy-mm-dd)    : 2013-09-18
+#
+# T[2] <freq>     <bw>  <fec_hi> <fec_lo> <mod>   <tm> <guard> <hi> [<plp_id>] [# comment]
+#----------------------------------------------------------------------------------------------
+T       514167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
+T       490167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
+T2      538167000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
+T       505833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
+T       481833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
+T       529833000  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-StocklandHill | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
index cd2c5887..7e362c38 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -5,11 +5,11 @@
 # location and provider: UK, Stockland Hill
 # 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       514167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
-T       490167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
-T2      538167000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
-T       505833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
-T       481833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
-T       529833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM6
+T  514167000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB1
+T  490167000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB2
+T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T  505833000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM4
+T  481833000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM5
+T  529833000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM6
-- 
cgit v1.2.3