From 8428cd2a44bf02012b13ec78176fc08ea405d1a7 Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 1 Jul 2019 06:29:05 +0100 Subject: [PATCH] Revert "CommRadio: fix tuning 25Khz and 75Khz channels" Revert this change - I will re-add the unit-tests again, but we need a different approach for 8.3 stations, than what I did here. This reverts commit 91cc83abb5b40817e0f6d6bf0b857c2e4547f9c0. --- src/Instrumentation/commradio.cxx | 50 ++--- .../unit_tests/Instrumentation/CMakeLists.txt | 2 - .../unit_tests/Instrumentation/TestSuite.cxx | 3 - .../Instrumentation/test_commRadio.cxx | 209 ------------------ .../Instrumentation/test_commRadio.hxx | 55 ----- 5 files changed, 15 insertions(+), 304 deletions(-) delete mode 100644 test_suite/unit_tests/Instrumentation/test_commRadio.cxx delete mode 100644 test_suite/unit_tests/Instrumentation/test_commRadio.hxx diff --git a/src/Instrumentation/commradio.cxx b/src/Instrumentation/commradio.cxx index 9c981f792..784f60585 100644 --- a/src/Instrumentation/commradio.cxx +++ b/src/Instrumentation/commradio.cxx @@ -131,9 +131,7 @@ void AtisSpeaker::valueChanged(SGPropertyNode * node) } FGSoundManager * smgr = globals->get_subsystem(); - if (!smgr) { - return; - } + assert(smgr != NULL); SG_LOG(SG_INSTR, SG_DEBUG,"AtisSpeaker voice is " << voice ); FLITEVoiceSynthesizer * synthesizer = dynamic_cast(smgr->getSynthesizer(voice)); @@ -380,32 +378,18 @@ private: EightPointThreeFrequencyFormatter( const EightPointThreeFrequencyFormatter & ); EightPointThreeFrequencyFormatter & operator = ( const EightPointThreeFrequencyFormatter & ); - void valueChanged (SGPropertyNode * prop) - { - if( prop == _channel.node() ) - setFrequency(prop->getDoubleValue()); - else if( prop == _channelNum.node() ) - setChannel(prop->getIntValue()); - } + void valueChanged (SGPropertyNode * prop) { + if( prop == _channel.node() ) + setFrequency(prop->getDoubleValue()); + else if( prop == _channelNum.node() ) + setChannel(prop->getIntValue()); + } void setChannel( int channel ) { channel %= 3040; if( channel < 0 ) channel += 3040; - - double f = 118.000 + 0.025*(channel/4); - if (channel % 4) { - f += 0.005*(channel%4); // 8.3khz channel - } else { - // 25Khz channel, but we need to adjust to displayed (not real) - // frequency back down for the xxx.x25 and xxx.x75 cases - const int lowDigits = channel % 16; - const bool is25KhzQuarterChannel = (lowDigits == 4) | (lowDigits == 12); - if (is25KhzQuarterChannel) { - f -= 0.005; - } - } - - _channel = f; // recurses to update frequency values + double f = 118.000 + 0.025*(channel/4) + 0.005*(channel%4); + if( f != _channel ) _channel = f; } void setFrequency( double channel ) { @@ -421,22 +405,17 @@ private: // sanitize range and round to nearest kHz. unsigned c = static_cast(SGMiscd::round(SGMiscd::clip( channel, 118.0, 136.99 ) * 1000)); - const int lowDigits = c % 100; - const bool is25KhzQuarterChannel = (lowDigits == 20) | (lowDigits == 70); - if (is25KhzQuarterChannel) { - c += 5; - } - if ( (c % 25) == 0 ) { // legacy 25kHz channels continue to be just that. _channelSpacing = 25.0; _frequency = c / 1000.0; int channelNum = (c-118000)/25*4; - - if ( channelNum != _channelNum ) { - _channelNum = channelNum; - } + if( channelNum != _channelNum ) _channelNum = channelNum; + + if( _frequency != channel ) { + _channel = _frequency; //triggers recursion + } } else { _channelSpacing = 8.33; @@ -469,6 +448,7 @@ private: PropertyObject _channelSpacing; PropertyObject _formattedChannel; PropertyObject _channelNum; + }; diff --git a/test_suite/unit_tests/Instrumentation/CMakeLists.txt b/test_suite/unit_tests/Instrumentation/CMakeLists.txt index 4ad34a69f..610ed2867 100644 --- a/test_suite/unit_tests/Instrumentation/CMakeLists.txt +++ b/test_suite/unit_tests/Instrumentation/CMakeLists.txt @@ -2,13 +2,11 @@ set(TESTSUITE_SOURCES ${TESTSUITE_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx ${CMAKE_CURRENT_SOURCE_DIR}/test_navRadio.cxx - ${CMAKE_CURRENT_SOURCE_DIR}/test_commRadio.cxx PARENT_SCOPE ) set(TESTSUITE_HEADERS ${TESTSUITE_HEADERS} ${CMAKE_CURRENT_SOURCE_DIR}/test_navRadio.hxx - ${CMAKE_CURRENT_SOURCE_DIR}/test_commRadio.hxx PARENT_SCOPE ) diff --git a/test_suite/unit_tests/Instrumentation/TestSuite.cxx b/test_suite/unit_tests/Instrumentation/TestSuite.cxx index 3daa12961..e51d4c35c 100644 --- a/test_suite/unit_tests/Instrumentation/TestSuite.cxx +++ b/test_suite/unit_tests/Instrumentation/TestSuite.cxx @@ -18,9 +18,6 @@ */ #include "test_navRadio.hxx" -#include "test_commRadio.hxx" // Set up the unit tests. CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(NavRadioTests, "Unit tests"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(CommRadioTests, "Unit tests"); - diff --git a/test_suite/unit_tests/Instrumentation/test_commRadio.cxx b/test_suite/unit_tests/Instrumentation/test_commRadio.cxx deleted file mode 100644 index 9e7492edc..000000000 --- a/test_suite/unit_tests/Instrumentation/test_commRadio.cxx +++ /dev/null @@ -1,209 +0,0 @@ -#include "test_commRadio.hxx" - -#include -#include - -#include "test_suite/FGTestApi/globals.hxx" -#include "test_suite/FGTestApi/NavDataCache.hxx" - -#include -#include - -#include - -using namespace Instrumentation; - -// Set up function for each test. -void CommRadioTests::setUp() -{ - FGTestApi::setUp::initTestGlobals("commradio"); - FGTestApi::setUp::initNavDataCache(); -} - - -// Clean up after each test. -void CommRadioTests::tearDown() -{ - FGTestApi::tearDown::shutdownTestGlobals(); -} - -void CommRadioTests::setPositionAndStabilise(SGSubsystem* r, const SGGeod& g) -{ - FGTestApi::setPosition(g); - for (int i=0; i<60; ++i) { - r->update(0.1); - } -} - -void CommRadioTests::testBasic() -{ - SGPropertyNode_ptr configNode(new SGPropertyNode); - configNode->setStringValue("name", "commtest"); - configNode->setIntValue("number", 2); - - auto sub = Instrumentation::CommRadio::createInstance(configNode); - std::unique_ptr r{sub}; - - r->bind(); - r->init(); - - SGPropertyNode_ptr node = globals->get_props()->getNode("instrumentation/commtest[2]"); - node->setBoolValue("serviceable", true); - // needed for the radio to power up - globals->get_props()->setDoubleValue("systems/electrical/outputs/commtest", 6.0); - - // invalid frequency, of course - node->setDoubleValue("frequencies/selected-mhz", 140.0); - - // let's use BIKF / Keflavik for testing - auto bikf = FGAirport::getByIdent("BIKF"); - setPositionAndStabilise(r.get(), bikf->geod()); - - // should be powered up - CPPUNIT_ASSERT_EQUAL(true, node->getBoolValue("operable")); - CPPUNIT_ASSERT_EQUAL(0.0, node->getDoubleValue("signal-quality-norm")); - std::string id = node->getStringValue("airport-id"); - CPPUNIT_ASSERT(id.empty()); - - // published frequencies in our apt.dat: -// 50 12830 ATIS -// 53 12190 GND -// 54 11830 TWR -// 54 13190 AIR GND -// 55 11930 APP -// 56 11930 DEP - - node->setDoubleValue("frequencies/selected-mhz", 128.30); - setPositionAndStabilise(r.get(), bikf->geod()); - - id = node->getStringValue("airport-id"); - CPPUNIT_ASSERT_EQUAL(std::string{"BIKF"}, id); - CPPUNIT_ASSERT_EQUAL(1.0, node->getDoubleValue("signal-quality-norm")); - - std::string type = node->getStringValue("station-type"); - CPPUNIT_ASSERT_EQUAL(std::string{"atis"}, type); - - - // and now let's re-tune - - node->setDoubleValue("frequencies/selected-mhz", 118.30); - setPositionAndStabilise(r.get(), bikf->geod()); - - id = node->getStringValue("airport-id"); - CPPUNIT_ASSERT_EQUAL(std::string{"BIKF"}, id); - CPPUNIT_ASSERT_EQUAL(1.0, node->getDoubleValue("signal-quality-norm")); - - type = node->getStringValue("station-type"); - CPPUNIT_ASSERT_EQUAL(std::string{"tower"}, type); - -} - -void CommRadioTests::testWith8Point3Mode() -{ - SGPropertyNode_ptr configNode(new SGPropertyNode); - configNode->setStringValue("name", "commtest"); - configNode->setIntValue("number", 2); - configNode->setBoolValue("eight-point-three", true); - auto sub = Instrumentation::CommRadio::createInstance(configNode); - std::unique_ptr r{sub}; - - r->bind(); - r->init(); - - SGPropertyNode_ptr node = globals->get_props()->getNode("instrumentation/commtest[2]"); - node->setBoolValue("serviceable", true); - // needed for the radio to power up - globals->get_props()->setDoubleValue("systems/electrical/outputs/commtest", 6.0); - - - // EDDF ATIS is a known problem case - auto eddf = FGAirport::getByIdent("EDDF"); - setPositionAndStabilise(r.get(), eddf->geod()); - - // should be powered up - CPPUNIT_ASSERT_EQUAL(true, node->getBoolValue("operable")); - - // published frequencies in our apt.dat: -// 50 11802 ATIS -// 50 11872 ATIS 2 -// 52 12190 Delivery -// 53 12180 Ground -// 53 12195 Apron East -// 53 12185 Apron South -// 53 12170 Apron West -// 54 11990 Tower -// 54 12485 Tower -// 54 12732 Tower -// 55 11845 Langen Radar -// 55 12655 Langen Radar -// 55 13612 Langen Radar -// 56 12015 Langen Radar -// 56 12080 Langen Radar - - node->setDoubleValue("frequencies/selected-mhz", 118.02); - setPositionAndStabilise(r.get(), eddf->geod()); - - std::string id = node->getStringValue("airport-id"); - CPPUNIT_ASSERT_EQUAL(std::string{"EDDF"}, id); - CPPUNIT_ASSERT_EQUAL(1.0, node->getDoubleValue("signal-quality-norm")); - - std::string type = node->getStringValue("station-type"); - CPPUNIT_ASSERT_EQUAL(std::string{"atis"}, type); - - CPPUNIT_ASSERT_EQUAL(std::string{"118.020"}, std::string{node->getStringValue("frequencies/selected-mhz-fmt")}); - CPPUNIT_ASSERT_EQUAL(4, node->getIntValue("frequencies/selected-channel")); - CPPUNIT_ASSERT_DOUBLES_EQUAL(118.020, node->getDoubleValue("frequencies/selected-mhz"), 0.001); - CPPUNIT_ASSERT_DOUBLES_EQUAL(118.025, node->getDoubleValue("frequencies/selected-real-frequency-mhz"), 0.001); - CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, node->getDoubleValue("signal-quality-norm"), 0.01); - - -// EDME / EGGENFELDEN - auto edme = FGAirport::getByIdent("EDME"); - node->setDoubleValue("frequencies/selected-mhz", 125.07); - setPositionAndStabilise(r.get(), edme->geod()); - - id = node->getStringValue("airport-id"); - CPPUNIT_ASSERT_EQUAL(std::string{"EDME"}, id); - CPPUNIT_ASSERT_EQUAL(1.0, node->getDoubleValue("signal-quality-norm")); - - CPPUNIT_ASSERT_EQUAL(std::string{"125.070"}, std::string{node->getStringValue("frequencies/selected-mhz-fmt")}); - CPPUNIT_ASSERT_EQUAL(1132, node->getIntValue("frequencies/selected-channel")); - CPPUNIT_ASSERT_DOUBLES_EQUAL(125.070, node->getDoubleValue("frequencies/selected-mhz"), 0.01); - CPPUNIT_ASSERT_DOUBLES_EQUAL(125.075, node->getDoubleValue("frequencies/selected-real-frequency-mhz"), 0.001); - -// let's try EDDF but passing the real 25ks frequency in instead - node->setDoubleValue("frequencies/selected-mhz", 118.025); - setPositionAndStabilise(r.get(), eddf->geod()); - - id = node->getStringValue("airport-id"); - CPPUNIT_ASSERT_EQUAL(std::string{"EDDF"}, id); - CPPUNIT_ASSERT_EQUAL(1.0, node->getDoubleValue("signal-quality-norm")); - - type = node->getStringValue("station-type"); - CPPUNIT_ASSERT_EQUAL(std::string{"atis"}, type); - - CPPUNIT_ASSERT_EQUAL(std::string{"118.020"}, std::string{node->getStringValue("frequencies/selected-mhz-fmt")}); - CPPUNIT_ASSERT_EQUAL(4, node->getIntValue("frequencies/selected-channel")); - CPPUNIT_ASSERT_DOUBLES_EQUAL(118.020, node->getDoubleValue("frequencies/selected-mhz"), 0.01); - CPPUNIT_ASSERT_DOUBLES_EQUAL(118.025, node->getDoubleValue("frequencies/selected-real-frequency-mhz"), 0.01); - CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, node->getDoubleValue("signal-quality-norm"), 0.01); - -// let's try some actual 8.3 spacing channels - note we don't have these in apt.dat right now so -// they won't tune in - node->setDoubleValue("frequencies/selected-mhz", 125.015); - setPositionAndStabilise(r.get(), edme->geod()); - - CPPUNIT_ASSERT_EQUAL(std::string{"125.015"}, std::string{node->getStringValue("frequencies/selected-mhz-fmt")}); - CPPUNIT_ASSERT_EQUAL(1123, node->getIntValue("frequencies/selected-channel")); - CPPUNIT_ASSERT_DOUBLES_EQUAL(125.0150, node->getDoubleValue("frequencies/selected-mhz"), 0.001); - CPPUNIT_ASSERT_DOUBLES_EQUAL(125.0167, node->getDoubleValue("frequencies/selected-real-frequency-mhz"), 0.001); - - - node->setDoubleValue("frequencies/selected-mhz", 120.810); - setPositionAndStabilise(r.get(), edme->geod()); - - CPPUNIT_ASSERT_EQUAL(std::string{"120.810"}, std::string{node->getStringValue("frequencies/selected-mhz-fmt")}); - CPPUNIT_ASSERT_EQUAL(450, node->getIntValue("frequencies/selected-channel")); - CPPUNIT_ASSERT_DOUBLES_EQUAL(120.810, node->getDoubleValue("frequencies/selected-mhz"), 0.001); - CPPUNIT_ASSERT_DOUBLES_EQUAL(120.80833, node->getDoubleValue("frequencies/selected-real-frequency-mhz"), 0.00001); -} diff --git a/test_suite/unit_tests/Instrumentation/test_commRadio.hxx b/test_suite/unit_tests/Instrumentation/test_commRadio.hxx deleted file mode 100644 index 7a486154e..000000000 --- a/test_suite/unit_tests/Instrumentation/test_commRadio.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2018 Edward d'Auvergne - * - * This file is part of the program FlightGear. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#ifndef _FG_COMMRADIO_UNIT_TESTS_HXX -#define _FG_COMMRADIO_UNIT_TESTS_HXX - - -#include -#include - -class SGSubsystem; -class SGGeod; - -// The flight plan unit tests. -class CommRadioTests : public CppUnit::TestFixture -{ - // Set up the test suite. - CPPUNIT_TEST_SUITE(CommRadioTests); - CPPUNIT_TEST(testBasic); - CPPUNIT_TEST(testWith8Point3Mode); - - CPPUNIT_TEST_SUITE_END(); - - void setPositionAndStabilise(SGSubsystem* r, const SGGeod& g); - -public: - // Set up function for each test. - void setUp(); - - // Clean up after each test. - void tearDown(); - - // The tests. - void testBasic(); - void testWith8Point3Mode(); -}; - -#endif // _FG_COMMRADIO_UNIT_TESTS_HXX