From 9527a0391eb93ed16df93567b9116493fd9303b6 Mon Sep 17 00:00:00 2001 From: adrian Date: Tue, 1 Nov 2011 17:44:41 +0200 Subject: [PATCH] add to project files --- projects/VC90/FlightGear/FlightGear.vcproj | 8 ++++++++ src/{Instrumentation => Include}/itm.cpp | 0 src/Instrumentation/CMakeLists.txt | 2 ++ src/Instrumentation/Makefile.am | 1 + src/Instrumentation/commradio.cxx | 4 ++-- src/Instrumentation/commradio.hxx | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) rename src/{Instrumentation => Include}/itm.cpp (100%) diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj index 58633d244..7b2de36b8 100644 --- a/projects/VC90/FlightGear/FlightGear.vcproj +++ b/projects/VC90/FlightGear/FlightGear.vcproj @@ -3865,6 +3865,14 @@ RelativePath="..\..\..\src\Instrumentation\wxradar.hxx" > + + + + diff --git a/src/Instrumentation/itm.cpp b/src/Include/itm.cpp similarity index 100% rename from src/Instrumentation/itm.cpp rename to src/Include/itm.cpp diff --git a/src/Instrumentation/CMakeLists.txt b/src/Instrumentation/CMakeLists.txt index 7ae7cf343..e092ec369 100644 --- a/src/Instrumentation/CMakeLists.txt +++ b/src/Instrumentation/CMakeLists.txt @@ -26,6 +26,7 @@ set(SOURCES mrg.cxx navradio.cxx newnavradio.cxx + commradio.cxx od_gauge.cxx rad_alt.cxx render_area_2d.cxx @@ -93,6 +94,7 @@ set(HEADERS mrg.hxx navradio.hxx newnavradio.hxx + commradio.hxx od_gauge.hxx rad_alt.hxx render_area_2d.hxx diff --git a/src/Instrumentation/Makefile.am b/src/Instrumentation/Makefile.am index 23292e17c..f51c8f900 100644 --- a/src/Instrumentation/Makefile.am +++ b/src/Instrumentation/Makefile.am @@ -23,6 +23,7 @@ libInstrumentation_a_SOURCES = \ mrg.cxx mrg.hxx\ navradio.cxx navradio.hxx \ newnavradio.cxx newnavradio.hxx \ + commradio.cxx commradio.hxx \ slip_skid_ball.cxx slip_skid_ball.hxx \ transponder.cxx transponder.hxx \ turn_indicator.cxx turn_indicator.hxx \ diff --git a/src/Instrumentation/commradio.cxx b/src/Instrumentation/commradio.cxx index 6ee5e44d4..304d2ddee 100644 --- a/src/Instrumentation/commradio.cxx +++ b/src/Instrumentation/commradio.cxx @@ -1,5 +1,5 @@ // commradio.cxx -- implementation of FGCommRadio -// +// Class to manage radio propagation using the ITM model // Written by Adrian Musceac, started August 2011. // // This program is free software; you can redistribute it and/or @@ -89,7 +89,7 @@ double FGCommRadio::getFrequency(int radio) { -void FGCommRadio::receive_text(SGGeod tx_pos, double freq, string text, +void FGCommRadio::receiveText(SGGeod tx_pos, double freq, string text, int ground_to_air) { comm1 = getFrequency(1); diff --git a/src/Instrumentation/commradio.hxx b/src/Instrumentation/commradio.hxx index 0ba3266c8..397fca581 100644 --- a/src/Instrumentation/commradio.hxx +++ b/src/Instrumentation/commradio.hxx @@ -62,7 +62,7 @@ public: double getFrequency(int radio); void setTxPower(double txpower) { _transmitter_power = txpower; }; // transmission_type: 1 for ground to air, 2 for air to air, 3 for pilot to ground, 4 for pilot to air - void receive_text(SGGeod tx_pos, double freq, string text, int transmission_type); + void receiveText(SGGeod tx_pos, double freq, string text, int transmission_type); void setPropagationModel(int model) { _propagation_model = model; }; }; -- 2.39.5