Added Unit-test(packetWithFSKTest, waveRenderTest) on CMakeLists.txt

> minor refactoring on TxEngine
euphony-io · Sep 13, 2021 · 5e89ae6 · 5e89ae6
1 parent dc67bf8
commit 5e89ae6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/euphony/src/main/cpp/core/source/TxEngine.cpp b/euphony/src/main/cpp/core/source/TxEngine.cpp
@@ -21,7 +21,7 @@ class TxEngine::TxEngineImpl : public IRestartable{
     std::shared_ptr<oboe::AudioStream> mStream;
     oboe::AudioStreamBuilder mStreamBuilder;
     std::unique_ptr<AudioStreamCallback> mCallback;
-    shared_ptr<EuphonyAudioSource> mAudioSource = nullptr;
+    std::shared_ptr<EuphonyAudioSource> mAudioSource = nullptr;
     bool mIsLatencyDetectionSupported = false;
 
     double eupiFreq;
@@ -71,9 +71,7 @@ class TxEngine::TxEngineImpl : public IRestartable{
                 return std::make_shared<WaveRenderer>(modulationResult, kChannelCount);
             }
             case ModeType::EUPI:
-                mAudioSource = std::make_shared<EuPIRenderer>(kSampleRate, kChannelCount);
-                std::dynamic_pointer_cast<EuPIRenderer>(mAudioSource)->setFrequency(eupiFreq);
-                return mAudioSource;
+                return std::make_shared<EuPIRenderer>(kSampleRate, kChannelCount);
         }
     }
 
@@ -159,10 +157,14 @@ class TxEngine::TxEngineImpl : public IRestartable{
                 mModeType = ModeType::DEFAULT;
                 break;
             case 1:
+                if(mModeType == ModeType::EUPI)
+                    return;
+
                 mModeType = ModeType::EUPI;
                 break;
         }
 
+
         mAudioSource = createAudioSource(mModeType);
     }
 

diff --git a/euphony/src/main/cpp/tests/CMakeLists.txt b/euphony/src/main/cpp/tests/CMakeLists.txt
@@ -20,8 +20,10 @@ add_executable(
         packetTest.cpp
         packetBuilderTest.cpp
         packetErrorDetectorTest.cpp
+        packetWithFSKTest.cpp
         waveTest.cpp
         waveBuilderTest.cpp
+        waveRendererTest.cpp
 )
 
 target_link_libraries(${TEST_EUPHONY} PUBLIC euphony gtest)