From c758e474a3f0764d4df4055ad487a3953d1cee72 Mon Sep 17 00:00:00 2001 From: CrazyCat Date: Sat, 7 Feb 2015 23:58:19 +0200 Subject: Update and fix multistream transponders. --- dvb-s/Astra-31.5E | 55 -------------------------------------- dvb-s/Atlantic-Bird-1-12.5W | 1 - dvb-s/Atlantic-Bird-3-5.0W | 65 ++++++++++++++++++++++----------------------- dvb-s/Hotbird-13.0E | 47 +++++++++++++------------------- dvb-s/Intelsat-12-45.0E | 1 - dvb-s/Sirius-5.0E | 4 +++ 6 files changed, 55 insertions(+), 118 deletions(-) delete mode 100644 dvb-s/Astra-31.5E diff --git a/dvb-s/Astra-31.5E b/dvb-s/Astra-31.5E deleted file mode 100644 index 31266ff..0000000 --- a/dvb-s/Astra-31.5E +++ /dev/null @@ -1,55 +0,0 @@ -# Astra 1G @ 31.5E -# std freq pol sr fec rolloff mod is_id pls_code pls_mode - -[CHANNEL] - DELIVERY_SYSTEM = DVBS2 - FREQUENCY = 11992000 - POLARIZATION = HORIZONTAL - SYMBOL_RATE = 27500000 - INNER_FEC = AUTO - ROLLOFF = AUTO - MODULATION = PSK/8 - STREAM_ID = 10 - INVERSION = AUTO - -[CHANNEL] - DELIVERY_SYSTEM = DVBS2 - FREQUENCY = 11992000 - POLARIZATION = HORIZONTAL - SYMBOL_RATE = 27500000 - INNER_FEC = AUTO - ROLLOFF = AUTO - MODULATION = PSK/8 - STREAM_ID = 20 - INVERSION = AUTO - -[CHANNEL] - DELIVERY_SYSTEM = DVBS2 - FREQUENCY = 12148000 - POLARIZATION = HORIZONTAL - SYMBOL_RATE = 27500000 - INNER_FEC = AUTO - ROLLOFF = AUTO - MODULATION = PSK/8 - STREAM_ID = 30 - INVERSION = AUTO - -[CHANNEL] - DELIVERY_SYSTEM = DVBS2 - FREQUENCY = 12148000 - POLARIZATION = HORIZONTAL - SYMBOL_RATE = 27500000 - INNER_FEC = AUTO - ROLLOFF = AUTO - MODULATION = PSK/8 - STREAM_ID = 40 - INVERSION = AUTO - -[CHANNEL] - DELIVERY_SYSTEM = DVBS - FREQUENCY = 12304500 - POLARIZATION = HORIZONTAL - SYMBOL_RATE = 27500000 - INNER_FEC = AUTO - INVERSION = AUTO - diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W index 383b122..0c85d50 100644 --- a/dvb-s/Atlantic-Bird-1-12.5W +++ b/dvb-s/Atlantic-Bird-1-12.5W @@ -1,5 +1,4 @@ # Atlantic Bird 1 @ 12.5W -# std freq pol sr fec rolloff mod is_id pls_code pls_mode [CHANNEL] DELIVERY_SYSTEM = DVBS diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W index 2800188..9d751a7 100644 --- a/dvb-s/Atlantic-Bird-3-5.0W +++ b/dvb-s/Atlantic-Bird-3-5.0W @@ -1,5 +1,4 @@ # Atlantic Bird 3 @ 5.0W -# std freq pol sr fec rolloff mod is_id pls_code pls_mode [CHANNEL] DELIVERY_SYSTEM = DVBS2 @@ -10,7 +9,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -22,7 +21,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 3 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -34,7 +33,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 11 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -46,7 +45,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 4 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -58,7 +57,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 5 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -70,7 +69,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 12 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -82,7 +81,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 1 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -94,7 +93,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -106,7 +105,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 3 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -118,7 +117,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 4 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -130,7 +129,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 5 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -142,7 +141,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 6 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -154,7 +153,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 7 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -166,7 +165,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 8 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -178,7 +177,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 9 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -190,7 +189,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 10 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -202,7 +201,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 11 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -214,7 +213,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 12 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -226,7 +225,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 13 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -238,7 +237,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 14 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -250,7 +249,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 15 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -262,7 +261,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 16 - PLS CODE = 16416 + PLS_CODE = 16416 INVERSION = AUTO [CHANNEL] @@ -274,7 +273,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 1 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -286,7 +285,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -298,7 +297,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 1 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -310,7 +309,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -322,8 +321,8 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 1 - PLS CODE = 121212 - PLS MODE = 1 + PLS_CODE = 121212 + PLS_MODE = 1 INVERSION = AUTO [CHANNEL] @@ -335,8 +334,8 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 121212 - PLS MODE = 1 + PLS_CODE = 121212 + PLS_MODE = 1 INVERSION = AUTO [CHANNEL] @@ -348,7 +347,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 1 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -360,6 +359,6 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E index c1759e0..0df0ab3 100644 --- a/dvb-s/Hotbird-13.0E +++ b/dvb-s/Hotbird-13.0E @@ -1,5 +1,4 @@ # EUTELSAT SkyPlex, Hotbird 13E -# std freq pol sr fec rolloff mod is_id pls_code pls_mode [CHANNEL] DELIVERY_SYSTEM = DVBS @@ -266,30 +265,6 @@ INVERSION = AUTO [CHANNEL] - DELIVERY_SYSTEM = DVBS2 - FREQUENCY = 11432000 - POLARIZATION = VERTICAL - SYMBOL_RATE = 27500000 - INNER_FEC = 2/3 - ROLLOFF = AUTO - MODULATION = PSK/8 - STREAM_ID = 1 - PLS CODE = 8 - INVERSION = AUTO - -[CHANNEL] - DELIVERY_SYSTEM = DVBS2 - FREQUENCY = 11432000 - POLARIZATION = VERTICAL - SYMBOL_RATE = 27500000 - INNER_FEC = 2/3 - ROLLOFF = AUTO - MODULATION = PSK/8 - STREAM_ID = 2 - PLS CODE = 8 - INVERSION = AUTO - -[CHANNEL] DELIVERY_SYSTEM = DVBS FREQUENCY = 11470000 POLARIZATION = VERTICAL @@ -458,11 +433,27 @@ INVERSION = AUTO [CHANNEL] - DELIVERY_SYSTEM = DVBS + DELIVERY_SYSTEM = DVBS2 + FREQUENCY = 11919000 + POLARIZATION = VERTICAL + SYMBOL_RATE = 27500000 + INNER_FEC = 2/3 + ROLLOFF = AUTO + MODULATION = PSK/8 + STREAM_ID = 1 + PLS_CODE = 8 + INVERSION = AUTO + +[CHANNEL] + DELIVERY_SYSTEM = DVBS2 FREQUENCY = 11919000 POLARIZATION = VERTICAL SYMBOL_RATE = 27500000 INNER_FEC = 2/3 + ROLLOFF = AUTO + MODULATION = PSK/8 + STREAM_ID = 2 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -690,7 +681,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 1 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] @@ -702,7 +693,7 @@ ROLLOFF = AUTO MODULATION = PSK/8 STREAM_ID = 2 - PLS CODE = 8 + PLS_CODE = 8 INVERSION = AUTO [CHANNEL] diff --git a/dvb-s/Intelsat-12-45.0E b/dvb-s/Intelsat-12-45.0E index d98b9dd..124b0ec 100644 --- a/dvb-s/Intelsat-12-45.0E +++ b/dvb-s/Intelsat-12-45.0E @@ -1,5 +1,4 @@ # Intelsat 12 @ 45.0E -# std freq pol sr fec rolloff mod is_id pls_code pls_mode [CHANNEL] DELIVERY_SYSTEM = DVBS2 diff --git a/dvb-s/Sirius-5.0E b/dvb-s/Sirius-5.0E index a6ba2e6..9f93c38 100644 --- a/dvb-s/Sirius-5.0E +++ b/dvb-s/Sirius-5.0E @@ -256,6 +256,7 @@ SYMBOL_RATE = 30000000 INNER_FEC = 3/4 INVERSION = AUTO + STREAM_ID = 10 [CHANNEL] DELIVERY_SYSTEM = DVBS2 @@ -264,6 +265,7 @@ SYMBOL_RATE = 30000000 INNER_FEC = 3/4 INVERSION = AUTO + STREAM_ID = 20 [CHANNEL] DELIVERY_SYSTEM = DVBS2 @@ -328,6 +330,7 @@ SYMBOL_RATE = 30000000 INNER_FEC = 3/4 INVERSION = AUTO + STREAM_ID = 30 [CHANNEL] DELIVERY_SYSTEM = DVBS2 @@ -336,6 +339,7 @@ SYMBOL_RATE = 30000000 INNER_FEC = 3/4 INVERSION = AUTO + STREAM_ID = 40 [CHANNEL] DELIVERY_SYSTEM = DVBS2 -- cgit v0.12