Updates to the electrical system model. "Juice" is now propogated through
the system, switches, fuses, circuit-breakers work. Nothing is actually wired into the electical system yet.
This commit is contained in:
curt
parent
3323efa256
commit
8d2014f7bc
2 changed files with 200 additions and 66 deletions
|
|
@ -30,12 +30,24 @@
|
|||
#include "electrical.hxx"
|
||||
|
||||
|
||||
FGElectricalSupplier::FGElectricalSupplier ( string _name, string _model,
|
||||
FGElectricalComponent::FGElectricalComponent() :
|
||||
kind(-1),
|
||||
name(""),
|
||||
prop(""),
|
||||
value(0.0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
FGElectricalSupplier::FGElectricalSupplier ( string _name, string _prop,
|
||||
string _model,
|
||||
double _volts, double _amps )
|
||||
{
|
||||
kind = FG_SUPPLIER;
|
||||
|
||||
name = _name;
|
||||
prop = _prop;
|
||||
// cout << "_model = " << _model << endl;
|
||||
if ( _model == "battery" ) {
|
||||
model = FG_BATTERY;
|
||||
} else if ( _model == "alternator" ) {
|
||||
|
|
@ -47,31 +59,79 @@ FGElectricalSupplier::FGElectricalSupplier ( string _name, string _model,
|
|||
}
|
||||
volts = _volts;
|
||||
amps = _amps;
|
||||
|
||||
fgSetDouble( prop.c_str(), amps );
|
||||
|
||||
_rpm_node = fgGetNode("/engines/engine[0]/rpm", true);
|
||||
}
|
||||
|
||||
|
||||
FGElectricalBus::FGElectricalBus ( string _name )
|
||||
double FGElectricalSupplier::get_output() {
|
||||
if ( model == FG_BATTERY ) {
|
||||
// cout << "battery amps = " << amps << endl;
|
||||
return amps;
|
||||
} else if ( model == FG_ALTERNATOR ) {
|
||||
// scale alternator output for rpms < 600. For rpms >= 600
|
||||
// give full output. This is just a WAG, but I'm keeping
|
||||
// things simple to start.
|
||||
double rpm = _rpm_node->getDoubleValue();
|
||||
double factor = rpm / 600.0;
|
||||
if ( factor > 1.0 ) {
|
||||
factor = 1.0;
|
||||
}
|
||||
// cout << "alternator amps = " << amps * factor << endl;
|
||||
return amps * factor;
|
||||
} else if ( model == FG_EXTERNAL ) {
|
||||
// cout << "external amps = " << 0.0 << endl;
|
||||
return 0.0;
|
||||
} else {
|
||||
cout << "unknown supplier type" << endl;
|
||||
}
|
||||
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
|
||||
FGElectricalBus::FGElectricalBus ( string _name, string _prop )
|
||||
{
|
||||
kind = FG_BUS;
|
||||
|
||||
name = _name;
|
||||
prop = _prop;
|
||||
}
|
||||
|
||||
|
||||
FGElectricalOutput::FGElectricalOutput ( string _name )
|
||||
FGElectricalOutput::FGElectricalOutput ( string _name, string _prop )
|
||||
{
|
||||
kind = FG_OUTPUT;
|
||||
|
||||
name = _name;
|
||||
prop = _prop;
|
||||
}
|
||||
|
||||
|
||||
FGElectricalConnector::FGElectricalConnector ()
|
||||
{
|
||||
kind = FG_CONNECTOR;
|
||||
name = "connector";
|
||||
}
|
||||
|
||||
|
||||
// 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.
|
||||
bool FGElectricalConnector::get_state() {
|
||||
unsigned int i;
|
||||
for ( i = 0; i < switches.size(); ++i ) {
|
||||
if ( ! switches[i]->getBoolValue() ) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
FGElectricalSystem::FGElectricalSystem () :
|
||||
enabled(false)
|
||||
{
|
||||
|
|
@ -122,6 +182,34 @@ void FGElectricalSystem::unbind () {
|
|||
|
||||
|
||||
void FGElectricalSystem::update (double dt) {
|
||||
if ( !enabled ) {
|
||||
return;
|
||||
}
|
||||
|
||||
// cout << "Updating electrical system" << endl;
|
||||
|
||||
unsigned int i;
|
||||
|
||||
// zero everything out before we start
|
||||
for ( i = 0; i < suppliers.size(); ++i ) {
|
||||
suppliers[i]->set_value( 0.0 );
|
||||
}
|
||||
for ( i = 0; i < buses.size(); ++i ) {
|
||||
buses[i]->set_value( 0.0 );
|
||||
}
|
||||
for ( i = 0; i < outputs.size(); ++i ) {
|
||||
outputs[i]->set_value( 0.0 );
|
||||
}
|
||||
for ( i = 0; i < connectors.size(); ++i ) {
|
||||
connectors[i]->set_value( 0.0 );
|
||||
}
|
||||
|
||||
// for each supplier, propogate the electrical current
|
||||
for ( i = 0; i < suppliers.size(); ++i ) {
|
||||
// cout << " Updating: " << suppliers[i]->get_name() << endl;
|
||||
propogate( suppliers[i], 0.0, " " );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -137,17 +225,20 @@ bool FGElectricalSystem::build () {
|
|||
if ( name == "supplier" ) {
|
||||
FGElectricalSupplier *s =
|
||||
new FGElectricalSupplier( node->getStringValue("name"),
|
||||
node->getStringValue("prop"),
|
||||
node->getStringValue("kind"),
|
||||
node->getDoubleValue("volts"),
|
||||
node->getDoubleValue("amps") );
|
||||
suppliers.push_back( s );
|
||||
} else if ( name == "bus" ) {
|
||||
FGElectricalBus *b =
|
||||
new FGElectricalBus( node->getStringValue("name") );
|
||||
new FGElectricalBus( node->getStringValue("name"),
|
||||
node->getStringValue("prop") );
|
||||
buses.push_back( b );
|
||||
} else if ( name == "output" ) {
|
||||
FGElectricalOutput *o =
|
||||
new FGElectricalOutput( node->getStringValue("name") );
|
||||
new FGElectricalOutput( node->getStringValue("name"),
|
||||
node->getStringValue("prop") );
|
||||
outputs.push_back( o );
|
||||
} else if ( name == "connector" ) {
|
||||
FGElectricalConnector *c =
|
||||
|
|
@ -165,9 +256,9 @@ bool FGElectricalSystem::build () {
|
|||
if ( s != NULL ) {
|
||||
c->add_input( s );
|
||||
if ( s->get_kind() == FG_SUPPLIER ) {
|
||||
((FGElectricalSupplier *)s)->add_output( c );
|
||||
s->add_output( c );
|
||||
} else if ( s->get_kind() == FG_BUS ) {
|
||||
((FGElectricalBus *)s)->add_output( c );
|
||||
s->add_output( c );
|
||||
} else {
|
||||
SG_LOG( SG_ALL, SG_ALERT,
|
||||
"Attempt to connect to something that can't provide an output: "
|
||||
|
|
@ -185,9 +276,9 @@ bool FGElectricalSystem::build () {
|
|||
if ( s != NULL ) {
|
||||
c->add_output( s );
|
||||
if ( s->get_kind() == FG_BUS ) {
|
||||
((FGElectricalBus *)s)->add_input( c );
|
||||
s->add_input( c );
|
||||
} else if ( s->get_kind() == FG_OUTPUT ) {
|
||||
((FGElectricalOutput *)s)->add_input( c );
|
||||
s->add_input( c );
|
||||
} else {
|
||||
SG_LOG( SG_ALL, SG_ALERT,
|
||||
"Attempt to connect to something that can't provide an input: "
|
||||
|
|
@ -201,7 +292,10 @@ bool FGElectricalSystem::build () {
|
|||
return false;
|
||||
}
|
||||
} else if ( cname == "switch" ) {
|
||||
c->add_switch( child->getStringValue() );
|
||||
// set default value of switch to true
|
||||
// cout << "Switch = " << child->getStringValue() << endl;
|
||||
fgSetBool( child->getStringValue(), true );
|
||||
c->add_switch( fgGetNode( child->getStringValue(), true ) );
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -215,6 +309,51 @@ bool FGElectricalSystem::build () {
|
|||
}
|
||||
|
||||
|
||||
// propogate the electrical current through the network
|
||||
void FGElectricalSystem::propogate( FGElectricalComponent *node, double val,
|
||||
string s ) {
|
||||
s += " ";
|
||||
|
||||
// determine the current to carry forward
|
||||
double current = 0.0;
|
||||
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 << " is a bus" << endl;
|
||||
current = val;
|
||||
} else if ( node->get_kind() == FG_OUTPUT ) {
|
||||
// cout << s << " is an output" << endl;
|
||||
current = val;
|
||||
} else if ( node->get_kind() == FG_CONNECTOR ) {
|
||||
// cout << s << " is a connector" << endl;
|
||||
if ( ((FGElectricalConnector *)node)->get_state() ) {
|
||||
current = val;
|
||||
} else {
|
||||
current = 0.0;
|
||||
}
|
||||
// cout << s << " val = " << current << endl;
|
||||
} else {
|
||||
cout << "unkown node type" << endl;
|
||||
}
|
||||
|
||||
if ( current > node->get_value() ) {
|
||||
node->set_value( current );
|
||||
}
|
||||
|
||||
if ( ! node->get_prop().empty() ) {
|
||||
fgSetDouble( node->get_prop().c_str(), node->get_value() );
|
||||
}
|
||||
// cout << s << node->get_name() << " -> " << node->get_value() << endl;
|
||||
|
||||
// propogate to all children
|
||||
int i;
|
||||
for ( i = 0; i < node->get_num_outputs(); ++i ) {
|
||||
propogate( node->get_output(i), current, s );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// search for the named component and return a pointer to it, NULL otherwise
|
||||
FGElectricalComponent *FGElectricalSystem::find ( const string &name ) {
|
||||
unsigned int i;
|
||||
|
|
@ -222,7 +361,7 @@ FGElectricalComponent *FGElectricalSystem::find ( const string &name ) {
|
|||
|
||||
// search suppliers
|
||||
for ( i = 0; i < suppliers.size(); ++i ) {
|
||||
s = ((FGElectricalSupplier *)suppliers[i])->get_name();
|
||||
s = suppliers[i]->get_name();
|
||||
// cout << " " << s << endl;
|
||||
if ( s == name ) {
|
||||
return suppliers[i];
|
||||
|
|
@ -231,7 +370,7 @@ FGElectricalComponent *FGElectricalSystem::find ( const string &name ) {
|
|||
|
||||
// then search buses
|
||||
for ( i = 0; i < buses.size(); ++i ) {
|
||||
s = ((FGElectricalBus *)buses[i])->get_name();
|
||||
s = buses[i]->get_name();
|
||||
// cout << " " << s << endl;
|
||||
if ( s == name ) {
|
||||
return buses[i];
|
||||
|
|
@ -240,7 +379,7 @@ FGElectricalComponent *FGElectricalSystem::find ( const string &name ) {
|
|||
|
||||
// then search outputs
|
||||
for ( i = 0; i < outputs.size(); ++i ) {
|
||||
s = ((FGElectricalOutput *)outputs[i])->get_name();
|
||||
s = outputs[i]->get_name();
|
||||
// cout << " " << s << endl;
|
||||
if ( s == name ) {
|
||||
return outputs[i];
|
||||
|
|
|
|||
|
|
@ -51,48 +51,71 @@ SG_USING_STD(vector);
|
|||
// Base class for other electrical components
|
||||
class FGElectricalComponent {
|
||||
|
||||
protected:
|
||||
|
||||
typedef vector<FGElectricalComponent *> comp_list;
|
||||
typedef vector<string> string_list;
|
||||
|
||||
int kind;
|
||||
string name;
|
||||
string prop;
|
||||
double value;
|
||||
|
||||
comp_list inputs;
|
||||
comp_list outputs;
|
||||
|
||||
public:
|
||||
|
||||
FGElectricalComponent() {}
|
||||
FGElectricalComponent();
|
||||
virtual ~FGElectricalComponent() {}
|
||||
|
||||
virtual string get_name() { return ""; }
|
||||
inline string get_name() { return name; }
|
||||
inline string get_prop() { return prop; }
|
||||
|
||||
int kind;
|
||||
inline int get_kind() { return kind; }
|
||||
inline int get_kind() const { return kind; }
|
||||
inline double get_value() const { return value; }
|
||||
inline void set_value( double val ) { value = val; }
|
||||
|
||||
inline int get_num_outputs() const { return outputs.size(); }
|
||||
inline FGElectricalComponent *get_output( const int i ) {
|
||||
return outputs[i];
|
||||
}
|
||||
inline void add_output( FGElectricalComponent *c ) {
|
||||
outputs.push_back( c );
|
||||
}
|
||||
|
||||
inline int get_num_inputs() const { return outputs.size(); }
|
||||
inline FGElectricalComponent *get_input( const int i ) {
|
||||
return inputs[i];
|
||||
}
|
||||
inline void add_input( FGElectricalComponent *c ) {
|
||||
inputs.push_back( c );
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// Electrical supplier
|
||||
class FGElectricalSupplier : public FGElectricalComponent {
|
||||
|
||||
SGPropertyNode_ptr _rpm_node;
|
||||
|
||||
enum FGSupplierType {
|
||||
FG_BATTERY = 0,
|
||||
FG_ALTERNATOR = 1,
|
||||
FG_EXTERNAL = 2
|
||||
};
|
||||
|
||||
string name;
|
||||
int model;
|
||||
double volts;
|
||||
double amps;
|
||||
|
||||
comp_list outputs;
|
||||
|
||||
public:
|
||||
|
||||
FGElectricalSupplier ( string _name, string _model,
|
||||
FGElectricalSupplier ( string _name, string _prop, string _model,
|
||||
double _volts, double _amps );
|
||||
~FGElectricalSupplier () {}
|
||||
|
||||
void add_output( FGElectricalComponent *c ) {
|
||||
outputs.push_back( c );
|
||||
}
|
||||
|
||||
string get_name() const { return name; }
|
||||
double get_output();
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -100,24 +123,10 @@ public:
|
|||
// outputs)
|
||||
class FGElectricalBus : public FGElectricalComponent {
|
||||
|
||||
string name;
|
||||
comp_list inputs;
|
||||
comp_list outputs;
|
||||
|
||||
public:
|
||||
|
||||
FGElectricalBus ( string _name );
|
||||
FGElectricalBus ( string _name, string _prop );
|
||||
~FGElectricalBus () {}
|
||||
|
||||
void add_input( FGElectricalComponent *c ) {
|
||||
inputs.push_back( c );
|
||||
}
|
||||
|
||||
void add_output( FGElectricalComponent *c ) {
|
||||
outputs.push_back( c );
|
||||
}
|
||||
|
||||
string get_name() const { return name; }
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -125,19 +134,10 @@ public:
|
|||
// flexibility
|
||||
class FGElectricalOutput : public FGElectricalComponent {
|
||||
|
||||
string name;
|
||||
comp_list inputs;
|
||||
|
||||
public:
|
||||
|
||||
FGElectricalOutput ( string _name );
|
||||
FGElectricalOutput ( string _name, string _prop );
|
||||
~FGElectricalOutput () {}
|
||||
|
||||
void add_input( FGElectricalComponent *c ) {
|
||||
inputs.push_back( c );
|
||||
}
|
||||
|
||||
string get_name() const { return name; }
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -147,26 +147,19 @@ class FGElectricalConnector : public FGElectricalComponent {
|
|||
|
||||
comp_list inputs;
|
||||
comp_list outputs;
|
||||
string_list switches;
|
||||
typedef vector<SGPropertyNode *> switch_list;
|
||||
switch_list switches;
|
||||
|
||||
public:
|
||||
|
||||
FGElectricalConnector ();
|
||||
~FGElectricalConnector () {}
|
||||
|
||||
void add_input( FGElectricalComponent *c ) {
|
||||
inputs.push_back( c );
|
||||
void add_switch( SGPropertyNode *node ) {
|
||||
switches.push_back( node );
|
||||
}
|
||||
|
||||
void add_output( FGElectricalComponent *c ) {
|
||||
outputs.push_back( c );
|
||||
}
|
||||
|
||||
void add_switch( const string &s ) {
|
||||
switches.push_back( s );
|
||||
}
|
||||
|
||||
string get_name() const { return ""; }
|
||||
bool get_state();
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -197,17 +190,19 @@ public:
|
|||
virtual void update (double dt);
|
||||
|
||||
bool build ();
|
||||
void propogate( FGElectricalComponent *node, double val, string s = "" );
|
||||
FGElectricalComponent *find ( const string &name );
|
||||
|
||||
protected:
|
||||
|
||||
typedef vector<FGElectricalComponent *> comp_list;
|
||||
|
||||
private:
|
||||
|
||||
SGPropertyNode *config_props;
|
||||
// SGPropertyNode_ptr _serviceable_node;
|
||||
|
||||
bool enabled;
|
||||
|
||||
typedef vector<FGElectricalComponent *> comp_list;
|
||||
|
||||
comp_list suppliers;
|
||||
comp_list buses;
|
||||
comp_list outputs;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue