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-CrystalPalace | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

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

diff --git a/dvb-t/uk-CrystalPalace b/dvb-t/uk-CrystalPalace
index 9251b81..962e734 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -1,17 +1,15 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20120112 1 0 TERRESTRIAL GB </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Crystal Palace, UK
-# date (yyyy-mm-dd)    : 2012-02-12
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Crystal Palace
+# date (yyyy-mm-dd)    : 2013-09-18
 #
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 481833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
-T 537833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T 505833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T 561833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
-T 529833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T 578166670 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T2 0 16435 554000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO    # London.
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+#----------------------------------------------------------------------------------------------
+T  490000000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB1
+T  514000000 8MHz 2/3 NONE QAM64  8k  1/32  NONE   # PSB2
+T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T  506000000 8MHz 3/4 NONE QAM64  8k  1/32  NONE   # COM4
+T  482000000 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