fix NAV receiver vs GPS bugs

[flightgear.git] / src / Instrumentation / transponder.cxx

diff --git a/src/Instrumentation/transponder.cxx b/src/Instrumentation/transponder.cxx
index 882bd160aeb8568c34262e693c69aa54012594d0..9fa5f13a34cc76d180357f6a407816225dc10839 100644 (file)
--- a/src/Instrumentation/transponder.cxx
+++ b/src/Instrumentation/transponder.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -26,29 +26,11 @@
 
 Transponder::Transponder(SGPropertyNode *node)
     :
-    name("transponder"),
-    num(0),
-    encoder("/instrumentation/encoder")
+    _name(node->getStringValue("name", "transponder")),
+    _num(node->getIntValue("number", 0)),
+    _mode_c_altitude(node->getStringValue("mode-c-altitude", 
+                                         "/instrumentation/encoder/mode-c-alt-ft"))
 {
-    int i;
-    for ( i = 0; i < node->nChildren(); ++i ) {
-        SGPropertyNode *child = node->getChild(i);
-        string cname = child->getName();
-        string cval = child->getStringValue();
-        if ( cname == "name" ) {
-            name = cval;
-        } else if ( cname == "number" ) {
-            num = child->getIntValue();
-        } else if ( cname == "encoder" ) {
-            encoder = cval;
-        } else {
-            SG_LOG( SG_INSTR, SG_WARN, 
-                    "Error in transponder config logic" );
-            if ( name.length() ) {
-                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
-            }
-        }
-    }
 }
 
 
@@ -60,19 +42,16 @@ Transponder::~Transponder()
 void Transponder::init()
 {
     string branch;
-    branch = "/instrumentation/" + name;
-    encoder += "/mode-c-alt-ft";
+    branch = "/instrumentation/" + _name;
 
-    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
     // Inputs
-    pressureAltitudeNode = fgGetNode(encoder.c_str(), true);
+    pressureAltitudeNode = fgGetNode(_mode_c_altitude.c_str(), true);
     busPowerNode = fgGetNode("/systems/electrical/outputs/transponder", true);
     serviceableNode = node->getChild("serviceable", 0, true);
     // Outputs
     idCodeNode = node->getChild("id-code", 0, true);
     flightLevelNode = node->getChild("flight-level", 0, true);
-    // Init
-    serviceableNode->setBoolValue(true);
 }