From c93544468d2031677c72f91fc77debfd6608e17e Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 19 Nov 2004 23:05:07 +0000
Subject: [PATCH] Changes to match Roy Ovesen's instrumentation code and
 property name changes.

---
 Aircraft/Generic/generic-instrumentation.xml | 17 ++++++++++++++++-
 Aircraft/Instruments/markerbeacon.xml        |  6 +++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Aircraft/Generic/generic-instrumentation.xml b/Aircraft/Generic/generic-instrumentation.xml
index fe20ab30a..f1631a02b 100644
--- a/Aircraft/Generic/generic-instrumentation.xml
+++ b/Aircraft/Generic/generic-instrumentation.xml
@@ -70,17 +70,32 @@ file, these values will be used (they are hardcoded).
     <static-port>/systems/static</static-port>
   </encoder>
 
+  <marker-beacon>
+    <name>marker-beacon</name>
+    <number>0</number>
+  </marker-beacon>
+
   <heading-indicator>
     <name>heading-indicator</name>
     <number>0</number>
     <vacuum-system>/systems/vacuum</vacuum-system>
   </heading-indicator>
 
+  <KT-70>
+    <name>kt-70</name>
+    <number>0</number>
+  </KT-70>
+
   <magnetic-compass>
     <name>magnetic-compass</name>
     <number>0</number>
   </magnetic-compass>
 
+  <nav-radio>
+    <name>nav-radio</name>
+    <number>0</number>
+  </nav-radio>
+
   <slip-skid-ball>
     <name>slip-skid-ball</name>
     <number>0</number>
@@ -108,4 +123,4 @@ file, these values will be used (they are hardcoded).
     <number>0</number>
   </gps>
 
-</PropertyList>
\ No newline at end of file
+</PropertyList>
diff --git a/Aircraft/Instruments/markerbeacon.xml b/Aircraft/Instruments/markerbeacon.xml
index 6021ea655..f20fd0890 100644
--- a/Aircraft/Instruments/markerbeacon.xml
+++ b/Aircraft/Instruments/markerbeacon.xml
@@ -46,7 +46,7 @@ properties' values.
    <type>switch</type>
    <layer>
    <condition>
-    <property>/radios/marker-beacon/outer</property>
+    <property>/instrumentation/marker-beacon/outer</property>
    </condition>
    <name>on</name>
    <texture>
@@ -127,7 +127,7 @@ properties' values.
    <type>switch</type>
    <layer>
    <condition>
-    <property>/radios/marker-beacon/middle</property> 
+    <property>/instrumentation/marker-beacon/middle</property> 
    </condition>
    <name>on</name>
    <texture>
@@ -210,7 +210,7 @@ properties' values.
    <type>switch</type>
    <layer>
    <condition>
-    <property>/radios/marker-beacon/inner</property> 
+    <property>/instrumentation/marker-beacon/inner</property> 
    </condition>
    <name>on</name>
    <texture>