From 4532828bb8ad8e0075195947944d2a284a2a7ab0 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Sun, 22 Sep 2013 21:35:33 +0200
Subject: Imported Upstream version 0+git20130920.f61d5ec

---
 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 90f6eef..8c884cd 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