Merge branch 'merge-requests/1555' into next

[flightgear.git] / src / Radio / radio.hxx

diff --git a/src/Radio/radio.hxx b/src/Radio/radio.hxx
index 2e67c5aefa8130ba28e98925f357cf7c77e15dbe..7b07d927e9e4e4b7eef9411f9c68c88dc5a26751 100644 (file)
--- a/src/Radio/radio.hxx
+++ b/src/Radio/radio.hxx
@@ -33,7 +33,7 @@
 using std::string;
 
 
-class FGRadio 
+class FGRadioTransmission 
 {
 private:
        bool isOperable() const
@@ -42,10 +42,18 @@ private:
        
        double _receiver_sensitivity;
        double _transmitter_power;
-       double _antenna_gain;
+       double _tx_antenna_height;
+       double _rx_antenna_height;
+       double _rx_antenna_gain;
+       double _tx_antenna_gain;
+       double _rx_line_losses;
+       double _tx_line_losses;
+       double _terrain_sampling_distance;
+       int _polarization;
        std::map<string, double[2]> _mat_database;
-       
+       SGPropertyNode *_root_node;
        int _propagation_model; /// 0 none, 1 round Earth, 2 ITM
+       double polarization_loss();
        double ITM_calculate_attenuation(SGGeod tx_pos, double freq, int ground_to_air);
        double LOS_calculate_attenuation(SGGeod tx_pos, double freq, int ground_to_air);
        void clutterLoss(double freq, double distance_m, double itm_elev[], std::deque<string> materials,
@@ -55,14 +63,28 @@ private:
        
 public:
 
-    FGRadio();
-    ~FGRadio();
+    FGRadioTransmission();
+    ~FGRadioTransmission();
 
-    
+    // a couple of setters and getters for convenience
     void setFrequency(double freq, int radio);
     double getFrequency(int radio);
     void setTxPower(double txpower) { _transmitter_power = txpower; };
+    void setRxSensitivity(double sensitivity) { _receiver_sensitivity = sensitivity; };
+    void setTxAntennaHeight(double tx_antenna_height) { _tx_antenna_height = tx_antenna_height; };
+    void setRxAntennaHeight(double rx_antenna_height) { _rx_antenna_height = rx_antenna_height; };
+    void setTxAntennaGain(double tx_antenna_gain) { _tx_antenna_gain = tx_antenna_gain; };
+    void setRxAntennaGain(double rx_antenna_gain) { _rx_antenna_gain = rx_antenna_gain; };
+    void setTxLineLosses(double tx_line_losses) { _tx_line_losses = tx_line_losses; };
+    void setRxLineLosses(double rx_line_losses) { _rx_line_losses = rx_line_losses; };
     void setPropagationModel(int model) { _propagation_model = model; };
+    void setPolarization(int polarization) { _polarization = polarization; };
+    // accessory functions for unit conversions
+    double watt_to_dbm(double power_watt);
+    double dbm_to_watt(double dbm);
+    double dbm_to_microvolt(double dbm);
+    
+    
     // transmission_type: 0 for air to ground 1 for ground to air, 2 for air to air, 3 for pilot to ground, 4 for pilot to air
     void receiveATC(SGGeod tx_pos, double freq, string text, int transmission_type);
     void receiveChat(SGGeod tx_pos, double freq, string text, int transmission_type);