fly/flightgear
1
0
Fork 0
Code Activity

cleanup

Browse source
This commit is contained in:
adrian 2011-11-24 06:39:54 +02:00
parent 98a94d83ef
commit 9bcc3a87b6
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ATC/trafficcontrol.cxx
View file

@ -47,6 +47,7 @@
#include <Airports/groundnetwork.hxx> #include <Airports/groundnetwork.hxx>
#include <Airports/dynamics.hxx> #include <Airports/dynamics.hxx>
#include <Airports/simple.hxx> #include <Airports/simple.hxx>
#include <Radio/radio.hxx>
using std::sort; using std::sort;
@ -760,6 +761,7 @@ void FGATCController::transmit(FGTrafficRecord * rec, FGAirportDynamics *parent,
rec->getLatitude(), sender_alt ); rec->getLatitude(), sender_alt );
} }
radio->receiveText(sender_pos, stationFreq, text, ground_to_air); radio->receiveText(sender_pos, stationFreq, text, ground_to_air);
delete radio;
} }
else { else {
fgSetString("/sim/messages/atc", text.c_str()); fgSetString("/sim/messages/atc", text.c_str());

2
src/Radio/itm.cpp
View file

@ -37,7 +37,7 @@
#include <math.h> #include <math.h>
#include <complex> #include <complex>
#include <assert.h> #include <assert.h>
#include <stdio.h>
const float THIRD = (1.0/3.0); const float THIRD = (1.0/3.0);
const float f_0 = 47.7; // 47.7 MHz from [Alg 1.1], to convert frequency into wavenumber and vica versa const float f_0 = 47.7; // 47.7 MHz from [Alg 1.1], to convert frequency into wavenumber and vica versa

7
src/Radio/radio.cxx
View file

@ -25,7 +25,7 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <deque> #include <deque>
#include "radio.hxx"
#include <Scenery/scenery.hxx> #include <Scenery/scenery.hxx>
#define WITH_POINT_TO_POINT 1 #define WITH_POINT_TO_POINT 1
@ -132,7 +132,8 @@ double FGRadio::ITM_calculate_attenuation(SGGeod pos, double freq,
char strmode[150]; char strmode[150];
int errnum; int errnum;
double tx_pow,ant_gain; double tx_pow = _transmitter_power;
double ant_gain = _antenna_gain;
double signal = 0.0; double signal = 0.0;
if(transmission_type == 1) if(transmission_type == 1)
@ -269,7 +270,7 @@ double FGRadio::ITM_calculate_attenuation(SGGeod pos, double freq,
// frequency in the middle of the bandplan, more accuracy is not necessary // frequency in the middle of the bandplan, more accuracy is not necessary
double fz_clr= 8.657 * sqrt(distance_m / 0.125); double fz_clr= 8.657 * sqrt(distance_m / 0.125);
// TODO: If we clear the first Fresnel zone, we are into line of sight teritory // TODO: If we clear the first Fresnel zone, we are into line of sight territory
// else we need to calculate point to point link loss // else we need to calculate point to point link loss
if((transmission_type == 3) || (transmission_type == 4)) { if((transmission_type == 3) || (transmission_type == 4)) {

2
src/Radio/radio.hxx
View file

@ -45,7 +45,7 @@ private:
double _antenna_gain; double _antenna_gain;
int _propagation_model; /// 0 none, 1 round Earth, 2 ITM int _propagation_model; /// 0 none, 1 round Earth, 2 ITM
double ITM_calculate_attenuation(SGGeod tx_pos, double freq, int ground_to_air) double ITM_calculate_attenuation(SGGeod tx_pos, double freq, int ground_to_air);
public: public: