X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSystems%2Felectrical.hxx;h=f6f21a4534a653f958f86dd73ab6ae1de2d8af43;hb=729e28754a5ff709d0a39d82d9734c8288ea0db1;hp=0627b83c0018b2eb3407d88e2f929faf6614a6a4;hpb=d05121ef4689d2b50b3fe1848cbb0d1f5a1db877;p=flightgear.git

diff --git a/src/Systems/electrical.hxx b/src/Systems/electrical.hxx
index 0627b83c0..f6f21a453 100644
--- a/src/Systems/electrical.hxx
+++ b/src/Systems/electrical.hxx
@@ -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.
 //
 // $Id$
 
@@ -32,11 +32,11 @@
 #  include <config.h>
 #endif
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -46,15 +46,19 @@ SG_USING_STD(vector);
 class FGElectricalSystem;
 
 
-#define FG_UNKNOWN  -1
-#define FG_SUPPLIER  0
-#define FG_BUS       1
-#define FG_OUTPUT    2
-#define FG_CONNECTOR 3
-
 // Base class for other electrical components
 class FGElectricalComponent {
 
+public:
+
+enum FGElectricalComponentType {
+    FG_UNKNOWN,
+    FG_SUPPLIER,
+    FG_BUS,
+    FG_OUTPUT,
+    FG_CONNECTOR
+};
+
 protected:
 
     typedef vector<FGElectricalComponent *> comp_list;
@@ -63,7 +67,10 @@ protected:
     int kind;
     string name;
     float volts;
-    float load_amps;
+    float load_amps;            // sum of current draw (load) due to
+                                // this node and all it's children
+    float available_amps;       // available current (after the load
+                                // is subtracted)
 
     comp_list inputs;
     comp_list outputs;
@@ -74,7 +81,7 @@ public:
     FGElectricalComponent();
     virtual ~FGElectricalComponent() {}
 
-    inline string get_name() { return name; }
+    inline const string& get_name() { return name; }
 
     inline int get_kind() const { return kind; }
 
@@ -84,6 +91,9 @@ public:
     inline float get_load_amps() const { return load_amps; }
     inline void set_load_amps( float val ) { load_amps = val; }
 
+    inline float get_available_amps() const { return available_amps; }
+    inline void set_available_amps( float val ) { available_amps = val; }
+
     inline int get_num_inputs() const { return outputs.size(); }
     inline FGElectricalComponent *get_input( const int i ) {
         return inputs[i];
@@ -101,7 +111,7 @@ public:
     }
 
     inline int get_num_props() const { return props.size(); }
-    inline string get_prop( const int i ) {
+    inline const string& get_prop( const int i ) {
         return props[i];
     }
     inline void add_prop( const string &s ) {
@@ -114,25 +124,44 @@ public:
 // Electrical supplier
 class FGElectricalSupplier : public FGElectricalComponent {
 
-    SGPropertyNode_ptr _rpm_node;
+public:
 
     enum FGSupplierType {
-        FG_BATTERY = 0,
-        FG_ALTERNATOR = 1,
-        FG_EXTERNAL = 2
+        FG_BATTERY,
+        FG_ALTERNATOR,
+        FG_EXTERNAL,
+        FG_UNKNOWN
     };
 
-    string rpm_src;
-    int model;
-    double volts;
-    double amps;
+private:
+
+    SGPropertyNode_ptr _rpm_node;
+
+    FGSupplierType model;       // store supplier type
+    float ideal_volts;          // ideal volts
+
+    // alternator fields
+    string rpm_src;             // property name of alternator power source
+    float rpm_threshold;        // minimal rpm to generate full power
+
+    // alt & ext supplier fields
+    float ideal_amps;           // total amps produced (above rpm threshold).
+
+    // battery fields
+    float amp_hours;            // fully charged battery capacity
+    float percent_remaining;    // percent of charge remaining
+    float charge_amps;          // maximum charge load battery can draw
 
 public:
 
     FGElectricalSupplier ( SGPropertyNode *node );
     ~FGElectricalSupplier () {}
 
-    double get_output();
+    inline FGSupplierType get_model() const { return model; }
+    float apply_load( float amps, float dt );
+    float get_output_volts();
+    float get_output_amps();
+    float get_charge_amps() const { return charge_amps; }
 };
 
 
@@ -151,18 +180,10 @@ public:
 // flexibility
 class FGElectricalOutput : public FGElectricalComponent {
 
-private:
-
-    // number of amps drawn by this output
-    float output_amps;
-
 public:
 
     FGElectricalOutput ( SGPropertyNode *node );
     ~FGElectricalOutput () {}
-
-    inline float get_output_amps() const { return output_amps; }
-    inline void set_output_amps( float val ) { output_amps = val; }
 };
 
 
@@ -172,7 +193,7 @@ class FGElectricalSwitch {
 
 private:
 
-    SGPropertyNode *switch_node;
+    SGPropertyNode_ptr switch_node;
     float rating_amps;
     bool circuit_breaker;
 
@@ -222,7 +243,7 @@ class FGElectricalSystem : public SGSubsystem
 
 public:
 
-    FGElectricalSystem ();
+    FGElectricalSystem ( SGPropertyNode *node );
     virtual ~FGElectricalSystem ();
 
     virtual void init ();
@@ -230,8 +251,10 @@ public:
     virtual void unbind ();
     virtual void update (double dt);
 
-    bool build ();
-    float propagate( FGElectricalComponent *node, double val, string s = "" );
+    bool build (SGPropertyNode* config_props);
+    float propagate( FGElectricalComponent *node, double dt,
+                     float input_volts, float input_amps,
+                     string s = "" );
     FGElectricalComponent *find ( const string &name );
 
 protected:
@@ -240,7 +263,9 @@ protected:
 
 private:
 
-    SGPropertyNode *config_props;
+    string name;
+    int num;
+    string path;
 
     bool enabled;
 
@@ -249,8 +274,8 @@ private:
     comp_list outputs;
     comp_list connectors;
 
-    SGPropertyNode *_volts_out;
-    SGPropertyNode *_amps_out;
+    SGPropertyNode_ptr _volts_out;
+    SGPropertyNode_ptr _amps_out;
 };