Merge tag 'upstream/0+git20130622.edc0bc3'

Upstream version 0+git20130622.edc0bc3

5 files changed, 66 insertions, 8 deletions

diff --git a/dvb-s/Astra-31.5E b/dvb-s/Astra-31.5E
new file mode 100644
index 0000000..a18479e
--- /dev/null
+++ b/dvb-s/Astra-31.5E
@@ -0,0 +1,8 @@
+# Astra 1G @ 31.5E
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
+S2 11992000 H 27500000 AUTO AUTO 8PSK 10
+S2 11992000 H 27500000 AUTO AUTO 8PSK 20
+S2 12148000 H 27500000 AUTO AUTO 8PSK 30
+S2 12148000 H 27500000 AUTO AUTO 8PSK 40
+S 12304500 H 27500000 AUTO AUTO QPSK
diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W
index 6735d70..e2d5cbe 100644
--- a/dvb-s/Atlantic-Bird-1-12.5W
+++ b/dvb-s/Atlantic-Bird-1-12.5W
@@ -1,5 +1,6 @@
 # Atlantic Bird 1 @ 12.5W
-# freq pol sr fec
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
 S 11099000 H 2000000 5/6
 S 11132000 H 3255000 3/4
 S 11136000 V 3700000 5/6
@@ -24,7 +25,11 @@ S 12594000 H 2170000 3/4
 S 12597000 H 1730000 3/4
 S 12604000 H 1481000 3/4
 S 12655000 H 4285000 3/4
-S 12659000 H 2141000 3/4
+S 12658000 H 2141000 3/4
 S 12662000 V 3928000 3/4
+S2 12718000 H 36510000 AUTO AUTO 8PSK 33
+S2 12718000 H 36510000 AUTO AUTO 8PSK 34
+S2 12718000 H 36510000 AUTO AUTO 8PSK 35
+S2 12718000 H 36510000 AUTO AUTO 8PSK 36
 S 12720000 V 1808000 3/4
 S 12743000 V 3214000 3/4
diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W
index 4e7f007..671ecb4 100644
--- a/dvb-s/Atlantic-Bird-3-5.0W
+++ b/dvb-s/Atlantic-Bird-3-5.0W
@@ -1,4 +1,33 @@
 # Atlantic Bird 3 @ 5.0W
-# freq pol sr fec
-S 11096000 V 29950000 7/8
-S 11591000 V 20000000 2/3
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
+S2 11012000 V 30000000 AUTO AUTO 8PSK 2 16416
+S2 11012000 V 30000000 AUTO AUTO 8PSK 3 16416
+S2 11012000 V 30000000 AUTO AUTO 8PSK 11 16416
+S2 11179000 V 30000000 AUTO AUTO 8PSK 4 16416
+S2 11179000 V 30000000 AUTO AUTO 8PSK 5 16416
+S2 11179000 V 30000000 AUTO AUTO 8PSK 12 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 1 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 2 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 3 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 4 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 5 16416
+S2 11637000 V 30000000 AUTO AUTO 8PSK 6 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 7 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 8 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 9 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 10 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 11 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 12 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 13 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 14 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 15 16416
+S2 11675000 H 30000000 AUTO AUTO 8PSK 16 16416
+S2 12585000 H 27500000 AUTO AUTO 8PSK 1 8
+S2 12585000 H 27500000 AUTO AUTO 8PSK 2 8
+S2 12606000 V 29900000 AUTO AUTO 8PSK 1 8
+S2 12606000 V 29900000 AUTO AUTO 8PSK 2 8
+S2 12648000 V 29500000 AUTO AUTO 8PSK 1 121212 1
+S2 12648000 V 29500000 AUTO AUTO 8PSK 2 121212 1
+S2 12669000 H 30080000 AUTO AUTO 8PSK 1 8
+S2 12669000 H 30080000 AUTO AUTO 8PSK 2 8
diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E
index 7c916a8..9bf01bf 100644
--- a/dvb-s/Hotbird-13.0E
+++ b/dvb-s/Hotbird-13.0E
@@ -1,6 +1,6 @@
 # EUTELSAT SkyPlex, Hotbird 13E
-# freq pol sr fec
-S 12539000 H 27500000 3/4
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
 S 10719000 V 27500000 3/4
 S 10723000 H 29900000 3/4
 S 10757000 V 27500000 3/4
@@ -34,7 +34,8 @@ S 11355000 V 27500000 3/4
 S 11373000 H 27500000 2/3
 S 11393000 V 27500000 3/4
 S 11411000 H 27500000 5/6
-S 11432000 V 27500000 2/3
+S2 11432000 V 27500000 2/3 AUTO 8PSK 1 8
+S2 11432000 V 27500000 2/3 AUTO 8PSK 2 8
 S 11470000 V 27500000 5/6
 S 11488000 H 27500000 3/4
 S 11526000 H 27500000 3/4
@@ -84,6 +85,8 @@ S 12418000 V 27500000 3/4
 S 12437000 H 27500000 3/4
 S 12475000 H 27500000 3/4
 S 12519000 V 27500000 3/4
+S2 12539000 H 27500000 2/3 AUTO 8PSK 1 8
+S2 12539000 H 27500000 2/3 AUTO 8PSK 2 8
 S 12558000 V 27500000 3/4
 S 12577000 H 27500000 3/4
 S 12596000 V 27500000 3/4
diff --git a/dvb-s/Intelsat-12-45.0E b/dvb-s/Intelsat-12-45.0E
new file mode 100644
index 0000000..23b15c6
--- /dev/null
+++ b/dvb-s/Intelsat-12-45.0E
@@ -0,0 +1,13 @@
+# Intelsat 12 @ 45.0E
+# std freq pol sr fec rolloff mod is_id pls_code pls_mode
+
+S2 11468000 V 30000000 AUTO AUTO 8PSK
+S2 11495000 V 7299000 AUTO AUTO 8PSK
+S 11517000 V 2959000 AUTO
+S 11523000 V 5787000 AUTO
+S2 11550000 V 30000000 AUTO AUTO 8PSK
+S2 11591000 V 30000000 AUTO AUTO 8PSK 2
+S2 11591000 V 30000000 AUTO AUTO 8PSK 3
+S2 11591000 V 30000000 AUTO AUTO 8PSK 4
+S2 11632000 V 30000000 AUTO AUTO 8PSK
+S2 11673000 V 30000000 AUTO AUTO 8PSK