diff --git a/Readme.md b/Readme.md index 97c1818f4..efbf56dbe 100644 --- a/Readme.md +++ b/Readme.md @@ -263,16 +263,21 @@ The `plugins` subdirectory contains the associated plugins used to manage device - `xxxplugin.h/cpp` : Plugin interface - `xxxsettings.h/cpp` : Configuration manager - `xxxthread.h/cpp` : Reading samples + - `xxx.pro` : Qt .pro file for Windows/Android build - `channel`: Channel handlers: - - `xxx` : Demodulator internal handler (e.g xxx = am) + - `demodxxx` : Demodulator internal handler (e.g xxx = demodam) - `xxxdemod.h/cpp` : Demodulator core - `xxxdemodgui.h/cpp` : Demodulator GUI - `xxxplugin.h/cpp` : Plugin interface + - `demodxxx.pro` : Qt .pro file for Windows/Android build - `xxxanalyzer` : Analyzer internal handler (e.g xxx = channel) - `xxxanalyzer.h/cpp` : Analyzer core - `xxxanalyzergui.h/cpp` : Analyzer GUI - `xxxanalyzerplugin.h/cpp` : Analyzer plugin manager + - `xxxanalyzer.pro` : Qt .pro file for Windows/Android build - `xxxsrc` : Interface to the outside (e.g xxx = udp): - `xxxsrc.h/cpp` : Inteface core - `xxxsrcgui.h/cpp` : Interface GUI - `xxxsrcplugin/h/cpp` : Interface plugin manager + - `xxxsrc.pro` : Qt .pro file for Windows/Android build + \ No newline at end of file diff --git a/plugins/channel/CMakeLists.txt b/plugins/channel/CMakeLists.txt index a6094a91f..f0ca94834 100644 --- a/plugins/channel/CMakeLists.txt +++ b/plugins/channel/CMakeLists.txt @@ -1,13 +1,13 @@ project(demod) -add_subdirectory(lora) +add_subdirectory(demodlora) add_subdirectory(demodam) -add_subdirectory(bfm) -add_subdirectory(nfm) -add_subdirectory(ssb) +add_subdirectory(demodbfm) +add_subdirectory(demodnfm) +add_subdirectory(demodssb) add_subdirectory(tcpsrc) add_subdirectory(udpsrc) -add_subdirectory(wfm) +add_subdirectory(demodwfm) add_subdirectory(chanalyzer) #add_subdirectory(tetra) diff --git a/plugins/channel/bfm/CMakeLists.txt b/plugins/channel/demodbfm/CMakeLists.txt similarity index 100% rename from plugins/channel/bfm/CMakeLists.txt rename to plugins/channel/demodbfm/CMakeLists.txt diff --git a/plugins/channel/bfm/bfmdemod.cpp b/plugins/channel/demodbfm/bfmdemod.cpp similarity index 100% rename from plugins/channel/bfm/bfmdemod.cpp rename to plugins/channel/demodbfm/bfmdemod.cpp diff --git a/plugins/channel/bfm/bfmdemod.h b/plugins/channel/demodbfm/bfmdemod.h similarity index 100% rename from plugins/channel/bfm/bfmdemod.h rename to plugins/channel/demodbfm/bfmdemod.h diff --git a/plugins/channel/bfm/bfmdemodgui.cpp b/plugins/channel/demodbfm/bfmdemodgui.cpp similarity index 100% rename from plugins/channel/bfm/bfmdemodgui.cpp rename to plugins/channel/demodbfm/bfmdemodgui.cpp diff --git a/plugins/channel/bfm/bfmdemodgui.h b/plugins/channel/demodbfm/bfmdemodgui.h similarity index 100% rename from plugins/channel/bfm/bfmdemodgui.h rename to plugins/channel/demodbfm/bfmdemodgui.h diff --git a/plugins/channel/bfm/bfmdemodgui.ui b/plugins/channel/demodbfm/bfmdemodgui.ui similarity index 100% rename from plugins/channel/bfm/bfmdemodgui.ui rename to plugins/channel/demodbfm/bfmdemodgui.ui diff --git a/plugins/channel/bfm/bfmplugin.cpp b/plugins/channel/demodbfm/bfmplugin.cpp similarity index 100% rename from plugins/channel/bfm/bfmplugin.cpp rename to plugins/channel/demodbfm/bfmplugin.cpp diff --git a/plugins/channel/bfm/bfmplugin.h b/plugins/channel/demodbfm/bfmplugin.h similarity index 100% rename from plugins/channel/bfm/bfmplugin.h rename to plugins/channel/demodbfm/bfmplugin.h diff --git a/plugins/channel/bfm/rdsdecoder.cpp b/plugins/channel/demodbfm/rdsdecoder.cpp similarity index 100% rename from plugins/channel/bfm/rdsdecoder.cpp rename to plugins/channel/demodbfm/rdsdecoder.cpp diff --git a/plugins/channel/bfm/rdsdecoder.h b/plugins/channel/demodbfm/rdsdecoder.h similarity index 100% rename from plugins/channel/bfm/rdsdecoder.h rename to plugins/channel/demodbfm/rdsdecoder.h diff --git a/plugins/channel/bfm/rdsdemod.cpp b/plugins/channel/demodbfm/rdsdemod.cpp similarity index 100% rename from plugins/channel/bfm/rdsdemod.cpp rename to plugins/channel/demodbfm/rdsdemod.cpp diff --git a/plugins/channel/bfm/rdsdemod.h b/plugins/channel/demodbfm/rdsdemod.h similarity index 100% rename from plugins/channel/bfm/rdsdemod.h rename to plugins/channel/demodbfm/rdsdemod.h diff --git a/plugins/channel/bfm/rdsparser.cpp b/plugins/channel/demodbfm/rdsparser.cpp similarity index 100% rename from plugins/channel/bfm/rdsparser.cpp rename to plugins/channel/demodbfm/rdsparser.cpp diff --git a/plugins/channel/bfm/rdsparser.h b/plugins/channel/demodbfm/rdsparser.h similarity index 100% rename from plugins/channel/bfm/rdsparser.h rename to plugins/channel/demodbfm/rdsparser.h diff --git a/plugins/channel/bfm/rdstmc.cpp b/plugins/channel/demodbfm/rdstmc.cpp similarity index 100% rename from plugins/channel/bfm/rdstmc.cpp rename to plugins/channel/demodbfm/rdstmc.cpp diff --git a/plugins/channel/bfm/rdstmc.h b/plugins/channel/demodbfm/rdstmc.h similarity index 100% rename from plugins/channel/bfm/rdstmc.h rename to plugins/channel/demodbfm/rdstmc.h diff --git a/plugins/channel/lora/CMakeLists.txt b/plugins/channel/demodlora/CMakeLists.txt similarity index 100% rename from plugins/channel/lora/CMakeLists.txt rename to plugins/channel/demodlora/CMakeLists.txt diff --git a/plugins/channel/lora/lorabits.h b/plugins/channel/demodlora/lorabits.h similarity index 100% rename from plugins/channel/lora/lorabits.h rename to plugins/channel/demodlora/lorabits.h diff --git a/plugins/channel/lora/lorademod.cpp b/plugins/channel/demodlora/lorademod.cpp similarity index 100% rename from plugins/channel/lora/lorademod.cpp rename to plugins/channel/demodlora/lorademod.cpp diff --git a/plugins/channel/lora/lorademod.h b/plugins/channel/demodlora/lorademod.h similarity index 100% rename from plugins/channel/lora/lorademod.h rename to plugins/channel/demodlora/lorademod.h diff --git a/plugins/channel/lora/lorademodgui.cpp b/plugins/channel/demodlora/lorademodgui.cpp similarity index 100% rename from plugins/channel/lora/lorademodgui.cpp rename to plugins/channel/demodlora/lorademodgui.cpp diff --git a/plugins/channel/lora/lorademodgui.h b/plugins/channel/demodlora/lorademodgui.h similarity index 100% rename from plugins/channel/lora/lorademodgui.h rename to plugins/channel/demodlora/lorademodgui.h diff --git a/plugins/channel/lora/lorademodgui.ui b/plugins/channel/demodlora/lorademodgui.ui similarity index 100% rename from plugins/channel/lora/lorademodgui.ui rename to plugins/channel/demodlora/lorademodgui.ui diff --git a/plugins/channel/lora/loraplugin.cpp b/plugins/channel/demodlora/loraplugin.cpp similarity index 100% rename from plugins/channel/lora/loraplugin.cpp rename to plugins/channel/demodlora/loraplugin.cpp diff --git a/plugins/channel/lora/loraplugin.h b/plugins/channel/demodlora/loraplugin.h similarity index 100% rename from plugins/channel/lora/loraplugin.h rename to plugins/channel/demodlora/loraplugin.h diff --git a/plugins/channel/nfm/CMakeLists.txt b/plugins/channel/demodnfm/CMakeLists.txt similarity index 100% rename from plugins/channel/nfm/CMakeLists.txt rename to plugins/channel/demodnfm/CMakeLists.txt diff --git a/plugins/channel/nfm/nfmdemod.cpp b/plugins/channel/demodnfm/nfmdemod.cpp similarity index 100% rename from plugins/channel/nfm/nfmdemod.cpp rename to plugins/channel/demodnfm/nfmdemod.cpp diff --git a/plugins/channel/nfm/nfmdemod.h b/plugins/channel/demodnfm/nfmdemod.h similarity index 100% rename from plugins/channel/nfm/nfmdemod.h rename to plugins/channel/demodnfm/nfmdemod.h diff --git a/plugins/channel/nfm/nfmdemodgui.cpp b/plugins/channel/demodnfm/nfmdemodgui.cpp similarity index 100% rename from plugins/channel/nfm/nfmdemodgui.cpp rename to plugins/channel/demodnfm/nfmdemodgui.cpp diff --git a/plugins/channel/nfm/nfmdemodgui.h b/plugins/channel/demodnfm/nfmdemodgui.h similarity index 100% rename from plugins/channel/nfm/nfmdemodgui.h rename to plugins/channel/demodnfm/nfmdemodgui.h diff --git a/plugins/channel/nfm/nfmdemodgui.ui b/plugins/channel/demodnfm/nfmdemodgui.ui similarity index 100% rename from plugins/channel/nfm/nfmdemodgui.ui rename to plugins/channel/demodnfm/nfmdemodgui.ui diff --git a/plugins/channel/nfm/nfmplugin.cpp b/plugins/channel/demodnfm/nfmplugin.cpp similarity index 100% rename from plugins/channel/nfm/nfmplugin.cpp rename to plugins/channel/demodnfm/nfmplugin.cpp diff --git a/plugins/channel/nfm/nfmplugin.h b/plugins/channel/demodnfm/nfmplugin.h similarity index 100% rename from plugins/channel/nfm/nfmplugin.h rename to plugins/channel/demodnfm/nfmplugin.h diff --git a/plugins/channel/ssb/CMakeLists.txt b/plugins/channel/demodssb/CMakeLists.txt similarity index 100% rename from plugins/channel/ssb/CMakeLists.txt rename to plugins/channel/demodssb/CMakeLists.txt diff --git a/plugins/channel/ssb/ssbdemod.cpp b/plugins/channel/demodssb/ssbdemod.cpp similarity index 100% rename from plugins/channel/ssb/ssbdemod.cpp rename to plugins/channel/demodssb/ssbdemod.cpp diff --git a/plugins/channel/ssb/ssbdemod.h b/plugins/channel/demodssb/ssbdemod.h similarity index 100% rename from plugins/channel/ssb/ssbdemod.h rename to plugins/channel/demodssb/ssbdemod.h diff --git a/plugins/channel/ssb/ssbdemodgui.cpp b/plugins/channel/demodssb/ssbdemodgui.cpp similarity index 100% rename from plugins/channel/ssb/ssbdemodgui.cpp rename to plugins/channel/demodssb/ssbdemodgui.cpp diff --git a/plugins/channel/ssb/ssbdemodgui.h b/plugins/channel/demodssb/ssbdemodgui.h similarity index 100% rename from plugins/channel/ssb/ssbdemodgui.h rename to plugins/channel/demodssb/ssbdemodgui.h diff --git a/plugins/channel/ssb/ssbdemodgui.ui b/plugins/channel/demodssb/ssbdemodgui.ui similarity index 100% rename from plugins/channel/ssb/ssbdemodgui.ui rename to plugins/channel/demodssb/ssbdemodgui.ui diff --git a/plugins/channel/ssb/ssbplugin.cpp b/plugins/channel/demodssb/ssbplugin.cpp similarity index 100% rename from plugins/channel/ssb/ssbplugin.cpp rename to plugins/channel/demodssb/ssbplugin.cpp diff --git a/plugins/channel/ssb/ssbplugin.h b/plugins/channel/demodssb/ssbplugin.h similarity index 100% rename from plugins/channel/ssb/ssbplugin.h rename to plugins/channel/demodssb/ssbplugin.h diff --git a/plugins/channel/tetra/CMakeLists.txt b/plugins/channel/demodtetra/CMakeLists.txt similarity index 100% rename from plugins/channel/tetra/CMakeLists.txt rename to plugins/channel/demodtetra/CMakeLists.txt diff --git a/plugins/channel/tetra/tetrademod.cpp b/plugins/channel/demodtetra/tetrademod.cpp similarity index 100% rename from plugins/channel/tetra/tetrademod.cpp rename to plugins/channel/demodtetra/tetrademod.cpp diff --git a/plugins/channel/tetra/tetrademod.h b/plugins/channel/demodtetra/tetrademod.h similarity index 100% rename from plugins/channel/tetra/tetrademod.h rename to plugins/channel/demodtetra/tetrademod.h diff --git a/plugins/channel/tetra/tetrademodgui.cpp b/plugins/channel/demodtetra/tetrademodgui.cpp similarity index 100% rename from plugins/channel/tetra/tetrademodgui.cpp rename to plugins/channel/demodtetra/tetrademodgui.cpp diff --git a/plugins/channel/tetra/tetrademodgui.h b/plugins/channel/demodtetra/tetrademodgui.h similarity index 100% rename from plugins/channel/tetra/tetrademodgui.h rename to plugins/channel/demodtetra/tetrademodgui.h diff --git a/plugins/channel/tetra/tetrademodgui.ui b/plugins/channel/demodtetra/tetrademodgui.ui similarity index 100% rename from plugins/channel/tetra/tetrademodgui.ui rename to plugins/channel/demodtetra/tetrademodgui.ui diff --git a/plugins/channel/tetra/tetraplugin.cpp b/plugins/channel/demodtetra/tetraplugin.cpp similarity index 100% rename from plugins/channel/tetra/tetraplugin.cpp rename to plugins/channel/demodtetra/tetraplugin.cpp diff --git a/plugins/channel/tetra/tetraplugin.h b/plugins/channel/demodtetra/tetraplugin.h similarity index 100% rename from plugins/channel/tetra/tetraplugin.h rename to plugins/channel/demodtetra/tetraplugin.h diff --git a/plugins/channel/wfm/CMakeLists.txt b/plugins/channel/demodwfm/CMakeLists.txt similarity index 100% rename from plugins/channel/wfm/CMakeLists.txt rename to plugins/channel/demodwfm/CMakeLists.txt diff --git a/plugins/channel/wfm/wfmdemod.cpp b/plugins/channel/demodwfm/wfmdemod.cpp similarity index 100% rename from plugins/channel/wfm/wfmdemod.cpp rename to plugins/channel/demodwfm/wfmdemod.cpp diff --git a/plugins/channel/wfm/wfmdemod.h b/plugins/channel/demodwfm/wfmdemod.h similarity index 100% rename from plugins/channel/wfm/wfmdemod.h rename to plugins/channel/demodwfm/wfmdemod.h diff --git a/plugins/channel/wfm/wfmdemodgui.cpp b/plugins/channel/demodwfm/wfmdemodgui.cpp similarity index 100% rename from plugins/channel/wfm/wfmdemodgui.cpp rename to plugins/channel/demodwfm/wfmdemodgui.cpp diff --git a/plugins/channel/wfm/wfmdemodgui.h b/plugins/channel/demodwfm/wfmdemodgui.h similarity index 100% rename from plugins/channel/wfm/wfmdemodgui.h rename to plugins/channel/demodwfm/wfmdemodgui.h diff --git a/plugins/channel/wfm/wfmdemodgui.ui b/plugins/channel/demodwfm/wfmdemodgui.ui similarity index 100% rename from plugins/channel/wfm/wfmdemodgui.ui rename to plugins/channel/demodwfm/wfmdemodgui.ui diff --git a/plugins/channel/wfm/wfmplugin.cpp b/plugins/channel/demodwfm/wfmplugin.cpp similarity index 100% rename from plugins/channel/wfm/wfmplugin.cpp rename to plugins/channel/demodwfm/wfmplugin.cpp diff --git a/plugins/channel/wfm/wfmplugin.h b/plugins/channel/demodwfm/wfmplugin.h similarity index 100% rename from plugins/channel/wfm/wfmplugin.h rename to plugins/channel/demodwfm/wfmplugin.h