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-CaradonHill | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

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

diff --git a/dvb-t/uk-CaradonHill b/dvb-t/uk-CaradonHill
index 90f6eef4..7534a80c 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -1,10 +1,15 @@
-# UK, Caradon Hill
-# 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 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Caradon Hill
+# date (yyyy-mm-dd)    : 2013-09-18
+#
+# T[2] <freq>     <bw>  <fec_hi> <fec_lo> <mod>   <tm> <guard> <hi> [<plp_id>] [# comment]
+#----------------------------------------------------------------------------------------------
+T       530167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB1
+T       506167000  8MHz  2/3      NONE     QAM64   8k   1/32    NONE            # PSB2
+T2      482167000  8MHz  2/3      NONE     QAM256  32k  1/128   NONE  0         # PSB3
+T       474167000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM4
+T       497833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM5
+T       521833000  8MHz  3/4      NONE     QAM64   8k   1/32    NONE            # COM6
-- 
cgit v1.2.3