From 1df48528c321879b5a13481c5da51b0a1473c901 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 17 Apr 2011 17:37:34 +0200
Subject: [PATCH] ADF2 support New "--adf2" option. Also introducing "--adf1"
 for consistency, while keeping legacy "--adf".

---
 Translations/strings-default.xml |  3 ++-
 Translations/strings-es.xml      |  3 ++-
 Translations/strings-nl.xml      |  3 ++-
 options.xml                      | 10 ++++++++--
 preferences.xml                  | 16 +++++++++++++++-
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml
index de7b6bc1f..7bfd520eb 100644
--- a/Translations/strings-default.xml
+++ b/Translations/strings-default.xml
@@ -288,7 +288,8 @@
  <com2-desc>Set the COM2 radio frequency</com2-desc>
  <nav1-desc>Set the NAV1 radio frequency, optionally preceded by a radial.</nav1-desc>
  <nav2-desc>Set the NAV2 radio frequency, optionally preceded by a radial.</nav2-desc>
- <adf-desc>Set the ADF radio frequency, optionally preceded by a card rotation.</adf-desc>
+ <adf1-desc>Set the ADF1 radio frequency, optionally preceded by a card rotation.</adf1-desc>
+ <adf2-desc>Set the ADF2 radio frequency, optionally preceded by a card rotation.</adf2-desc>
  <dme-desc>Slave the ADF to one of the NAV radios, or set its internal frequency.</dme-desc>
 
  <situation-options>Situation Options</situation-options>
diff --git a/Translations/strings-es.xml b/Translations/strings-es.xml
index 40a097ddd..a4e49131d 100644
--- a/Translations/strings-es.xml
+++ b/Translations/strings-es.xml
@@ -270,7 +270,8 @@
 	<com2-desc>Establece la radio frecuencia de COM2</com2-desc>
 	<nav1-desc>Establece la radio frecuencia de NAV1, opcionalmente precedida por un radial.</nav1-desc>
 	<nav2-desc>Establece la radio frecuencia de NAV2, opcionalmente precedida por un radial.</nav2-desc>
-	<adf-desc>Establece la radio frecuencia de ADF, opcionalmente precedida por una rotacionde carta.</adf-desc>
+	<adf1-desc>Establece la radio frecuencia de ADF1, opcionalmente precedida por una rotacionde carta.</adf1-desc>
+	<adf2-desc>Establece la radio frecuencia de ADF2, opcionalmente precedida por una rotacionde carta.</adf2-desc>
 	<dme-desc>Esclaviza la ADF a una de las radios NAV, o establece su frecuencia interna.</dme-desc>
 
 	<situation-options>Opciones de emergencias</situation-options>
diff --git a/Translations/strings-nl.xml b/Translations/strings-nl.xml
index 14a850a83..7cdbf8233 100644
--- a/Translations/strings-nl.xml
+++ b/Translations/strings-nl.xml
@@ -235,7 +235,8 @@
  <avionics-options>Avionica Opties</avionics-options>
  <nav1-desc>Zet de NAV1 radio frequentie, eventueel voorafgegaand door een radial</nav1-desc>
  <nav2-desc>Zet de NAV2 radio frequentie, eventueel voorafgegaand door een radial</nav2-desc>
- <adf-desc>Zet de ADF radio frequentie, eventueel voorafgegaand door een kaart verdraaing</adf-desc>
+ <adf1-desc>Zet de ADF1 radio frequentie, eventueel voorafgegaand door een kaart verdraaing</adf1-desc>
+ <adf2-desc>Zet de ADF2 radio frequentie, eventueel voorafgegaand door een kaart verdraaing</adf2-desc>
  <dme-desc>Maak de ADF afhankelijk van een van de radio's, of zet zijn interne frequentie</dme-desc>
 
   <situation-options>Situatie opties</situation-options>
diff --git a/options.xml b/options.xml
index 6e1183e1c..4a1ed46c0 100644
--- a/options.xml
+++ b/options.xml
@@ -845,9 +845,15 @@
    </option>
 
    <option>
-    <name>adf</name>
+    <name>adf1</name>
     <arg>[rotation:]frequency</arg>
-    <description>strings/adf-desc</description>
+    <description>strings/adf1-desc</description>
+   </option>
+
+   <option>
+    <name>adf2</name>
+    <arg>[rotation:]frequency</arg>
+    <description>strings/adf2-desc</description>
    </option>
 
    <option>
diff --git a/preferences.xml b/preferences.xml
index 8612a787c..2d9925d48 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -1080,7 +1080,21 @@ Started September 2000 by David Megginson, david@megginson.com
 									archive="y">0</offset-sec>
 		</clock>
 
-		<adf>
+		<adf n="0">
+			<frequencies>
+				<selected-khz type="int">379</selected-khz>
+				<standby-khz type="int">341</standby-khz>
+			</frequencies>
+			<serviceable type="bool"
+									 archive="y">true</serviceable>
+			<indicated-bearing-deg type="double">90</indicated-bearing-deg>
+			<error-deg type="double">2</error-deg>
+			<mode>adf</mode>
+			<rotation-deg type="double">0</rotation-deg>
+			<volume-norm type="double">0.5</volume-norm>
+		</adf>
+
+		<adf n="1">
 			<frequencies>
 				<selected-khz type="int">379</selected-khz>
 				<standby-khz type="int">341</standby-khz>