// $Id$
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
#include <simgear/misc/sg_path.hxx>
#include <Main/fg_props.hxx>
}
volts = node->getDoubleValue("volts");
amps = node->getDoubleValue("amps");
+ rpm_src = node->getStringValue("rpm-source");
int i;
for ( i = 0; i < node->nChildren(); ++i ) {
SGPropertyNode *child = node->getChild(i);
// cout << " scanning: " << child->getName() << endl;
- if ( (string)child->getName() == "prop" ) {
+ if ( !strcmp(child->getName(), "prop") ) {
string prop = child->getStringValue();
// cout << " Adding prop = " << prop << endl;
add_prop( prop );
}
}
- _rpm_node = fgGetNode("/engines/engine[0]/rpm", true);
+ _rpm_node = fgGetNode( rpm_src.c_str(), true);
}
int i;
for ( i = 0; i < node->nChildren(); ++i ) {
SGPropertyNode *child = node->getChild(i);
- if ( (string)child->getName() == "prop" ) {
+ if ( !strcmp(child->getName(), "prop") ) {
string prop = child->getStringValue();
add_prop( prop );
}
int i;
for ( i = 0; i < node->nChildren(); ++i ) {
SGPropertyNode *child = node->getChild(i);
- if ( (string)child->getName() == "prop" ) {
+ if ( !strcmp(child->getName(), "prop") ) {
string prop = child->getStringValue();
add_prop( prop );
}
add_switch( fgGetNode( child->getStringValue(), true ) );
}
}
+
+ // do a 2nd pass to pick up starting switch value if specified
+ for ( i = 0; i < node->nChildren(); ++i ) {
+ SGPropertyNode *child = node->getChild(i);
+ string cname = child->getName();
+ string cval = child->getStringValue();
+ // cout << " " << cname << " = " << cval << endl;
+ if ( cname == "initial-state" ) {
+ if ( cval == "off" ) {
+ set_switches( false );
+ } else {
+ set_switches( true );
+ }
+ }
+ }
}
+// set all switches to the specified state
+void FGElectricalConnector::set_switches( bool state ) {
+ // cout << "setting switch state to " << state << endl;
+ for ( unsigned int i = 0; i < switches.size(); ++i ) {
+ switches[i]->setBoolValue( state );
+ }
+}
+
+
// return true if all switches are true, false otherwise. A connector
// could have multiple switches, but they all need to be true(closed)
// for current to get through.
config_props = new SGPropertyNode;
SGPropertyNode *path_n = fgGetNode("/sim/systems/electrical/path");
+ _volts_out = fgGetNode( "/systems/electrical/volts", true );
+ _amps_out = fgGetNode( "/systems/electrical/amps", true );
if (path_n) {
SGPath config( globals->get_fg_root() );
void FGElectricalSystem::update (double dt) {
if ( !enabled ) {
+ _amps_out->setDoubleValue(0);
return;
}
connectors[i]->set_value( 0.0 );
}
- // for each supplier, propogate the electrical current
+ // for each supplier, propagate the electrical current
for ( i = 0; i < suppliers.size(); ++i ) {
// cout << " Updating: " << suppliers[i]->get_name() << endl;
- propogate( suppliers[i], 0.0, " " );
+ propagate( suppliers[i], 0.0, " " );
}
+ double alt_norm
+ = fgGetDouble("/systems/electrical/suppliers/alternator") / 60.0;
+
+ // impliment an extremely simplistic voltage model (assumes
+ // certain naming conventions in electrical system config)
+ double volts = 0.0;
+ if ( fgGetBool("/controls/switches/master-bat") ) {
+ volts = 24.0;
+ }
+ if ( fgGetBool("/controls/switches/master-alt") &&
+ fgGetDouble("/engines/engine[0]/rpm") > 800 )
+ {
+ double alt_contrib = 28.0;
+ if ( alt_contrib > volts ) {
+ volts = alt_contrib;
+ }
+ }
+ _volts_out->setDoubleValue( volts );
+
+ // impliment an extremely simplistic amps model (assumes certain
+ // naming conventions in the electrical system config) ... FIXME:
+ // make this more generic
+ double amps = 0.0;
+ if ( fgGetBool("/controls/switches/master-bat") ) {
+ if ( fgGetBool("/controls/switches/master-alt") &&
+ fgGetDouble("/engines/engine[0]/rpm") > 800 )
+ {
+ amps += 40.0 * alt_norm;
+ }
+ amps -= 15.0; // normal load
+ if ( fgGetBool("/controls/switches/flashing-beacon") ) {
+ amps -= 7.5;
+ }
+ if ( fgGetBool("/controls/switches/nav-lights") ) {
+ amps -= 7.5;
+ }
+ if ( amps > 7.0 ) {
+ amps = 7.0;
+ }
+ }
+ _amps_out->setDoubleValue( amps );
}
}
-// propogate the electrical current through the network
-void FGElectricalSystem::propogate( FGElectricalComponent *node, double val,
+// propagate the electrical current through the network
+void FGElectricalSystem::propagate( FGElectricalComponent *node, double val,
string s ) {
s += " ";
// determine the current to carry forward
double current = 0.0;
- if ( node->get_kind() == FG_SUPPLIER ) {
+ if ( !fgGetBool("/systems/electrical/serviceable") ) {
+ current = 0;
+ } else if ( node->get_kind() == FG_SUPPLIER ) {
// cout << s << " is a supplier" << endl;
current = ((FGElectricalSupplier *)node)->get_output();
} else if ( node->get_kind() == FG_BUS ) {
}
// cout << s << node->get_name() << " -> " << node->get_value() << endl;
- // propogate to all children
+ // propagate to all children
for ( i = 0; i < node->get_num_outputs(); ++i ) {
- propogate( node->get_output(i), current, s );
+ propagate( node->get_output(i), current, s );
}
}