Update Amazonas 3 61.0W

The Amazonas 3 replaced the Amazonas 1 in 2012 as can be seen at [0].
Lets rename it accordingly. Further more, many of the transponders
have been dropped so remove those as well.

[0] http://space.skyrocket.de/doc_sdat/amazonas-3.htm

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>

2 files changed, 18 insertions, 411 deletions

diff --git a/dvb-s/Amazonas-61.0W b/dvb-s/Amazonas-61.0W
deleted file mode 100644
index b7471c12..00000000
--- a/dvb-s/Amazonas-61.0W
+++ /dev/null
@@ -1,411 +0,0 @@
-# Amazonas @ 61.0W
-# freq pol sr fec
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3957000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3966000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3993000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4137000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3409000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3941000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3480000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12092000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12132000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4174000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11128000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11185000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11049000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12052000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10975000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3631000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2785000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3677000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3985000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11810000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11921000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 21740000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11943000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4168000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7307000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12052000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26667000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12172000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12092000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28880000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4154000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9615000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11099000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7576000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11885000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11882000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11343000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11133000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11078000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1862000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11912000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11906000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11108000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12132000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11135000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26667000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4144000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4540000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11808000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11972000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26667000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4156000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4540000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4149000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4540000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3948000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4178000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11844000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11095000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11790000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12172000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11055000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12012000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Amazonas3-61.0W b/dvb-s/Amazonas3-61.0W
new file mode 100644
index 00000000..59b21459
--- /dev/null
+++ b/dvb-s/Amazonas3-61.0W
@@ -0,0 +1,18 @@
+# Amazonas @ 61.0W
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12522000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28888000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12642000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28888000
+	INNER_FEC = 3/4
+	INVERSION = AUTO