Reorganise the source code.

2024-10-08 14:26:46 +01:00 · 2024-10-08 14:26:46 +01:00 · 07d54f74cc
parent 05d1e7e9dc
commit 07d54f74cc
92 changed files with 28 additions and 27 deletions
--- a/src/AX25/AX25Defines.h
+++ b/src/AX25/AX25Defines.h
--- a/src/AX25/AX25Demodulator.cpp
+++ b/src/AX25/AX25Demodulator.cpp
--- a/src/AX25/AX25Demodulator.h
+++ b/src/AX25/AX25Demodulator.h
--- a/src/AX25/AX25Frame.cpp
+++ b/src/AX25/AX25Frame.cpp
--- a/src/AX25/AX25Frame.h
+++ b/src/AX25/AX25Frame.h
--- a/src/AX25/AX25RX.cpp
+++ b/src/AX25/AX25RX.cpp
--- a/src/AX25/AX25RX.h
+++ b/src/AX25/AX25RX.h
--- a/src/AX25/AX25TX.cpp
+++ b/src/AX25/AX25TX.cpp
--- a/src/AX25/AX25TX.h
+++ b/src/AX25/AX25TX.h
--- a/src/AX25/AX25Twist.cpp
+++ b/src/AX25/AX25Twist.cpp
--- a/src/AX25/AX25Twist.h
+++ b/src/AX25/AX25Twist.h
--- a/src/DMR/CalDMR.cpp
+++ b/src/DMR/CalDMR.cpp
--- a/src/DMR/CalDMR.h
+++ b/src/DMR/CalDMR.h
--- a/src/DMR/DMRDMORX.cpp
+++ b/src/DMR/DMRDMORX.cpp
--- a/src/DMR/DMRDMORX.h
+++ b/src/DMR/DMRDMORX.h
--- a/src/DMR/DMRDMOTX.cpp
+++ b/src/DMR/DMRDMOTX.cpp
--- a/src/DMR/DMRDMOTX.h
+++ b/src/DMR/DMRDMOTX.h
--- a/src/DMR/DMRDefines.h
+++ b/src/DMR/DMRDefines.h
--- a/src/DMR/DMRIdleRX.cpp
+++ b/src/DMR/DMRIdleRX.cpp
--- a/src/DMR/DMRIdleRX.h
+++ b/src/DMR/DMRIdleRX.h
--- a/src/DMR/DMRRX.cpp
+++ b/src/DMR/DMRRX.cpp
--- a/src/DMR/DMRRX.h
+++ b/src/DMR/DMRRX.h
--- a/src/DMR/DMRSlotRX.cpp
+++ b/src/DMR/DMRSlotRX.cpp
--- a/src/DMR/DMRSlotRX.h
+++ b/src/DMR/DMRSlotRX.h
--- a/src/DMR/DMRSlotType.cpp
+++ b/src/DMR/DMRSlotType.cpp
--- a/src/DMR/DMRSlotType.h
+++ b/src/DMR/DMRSlotType.h
--- a/src/DMR/DMRTX.cpp
+++ b/src/DMR/DMRTX.cpp
--- a/src/DMR/DMRTX.h
+++ b/src/DMR/DMRTX.h
--- a/src/DStar/CalDStarRX.cpp
+++ b/src/DStar/CalDStarRX.cpp
--- a/src/DStar/CalDStarRX.h
+++ b/src/DStar/CalDStarRX.h
--- a/src/DStar/CalDStarTX.cpp
+++ b/src/DStar/CalDStarTX.cpp
--- a/src/DStar/CalDStarTX.h
+++ b/src/DStar/CalDStarTX.h
--- a/src/DStar/DStarDefines.h
+++ b/src/DStar/DStarDefines.h
--- a/src/DStar/DStarRX.cpp
+++ b/src/DStar/DStarRX.cpp
--- a/src/DStar/DStarRX.h
+++ b/src/DStar/DStarRX.h
--- a/src/DStar/DStarTX.cpp
+++ b/src/DStar/DStarTX.cpp
--- a/src/DStar/DStarTX.h
+++ b/src/DStar/DStarTX.h
--- a/src/FM/CalFM.cpp
+++ b/src/FM/CalFM.cpp
--- a/src/FM/CalFM.h
+++ b/src/FM/CalFM.h
--- a/src/FM/FM.cpp
+++ b/src/FM/FM.cpp
--- a/src/FM/FM.h
+++ b/src/FM/FM.h
--- a/src/FM/FMBlanking.cpp
+++ b/src/FM/FMBlanking.cpp
--- a/src/FM/FMBlanking.h
+++ b/src/FM/FMBlanking.h
--- a/src/FM/FMCTCSSRX.cpp
+++ b/src/FM/FMCTCSSRX.cpp
--- a/src/FM/FMCTCSSRX.h
+++ b/src/FM/FMCTCSSRX.h
--- a/src/FM/FMCTCSSTX.cpp
+++ b/src/FM/FMCTCSSTX.cpp
--- a/src/FM/FMCTCSSTX.h
+++ b/src/FM/FMCTCSSTX.h
--- a/src/FM/FMDirectForm1.h
+++ b/src/FM/FMDirectForm1.h
--- a/src/FM/FMDownSampler.cpp
+++ b/src/FM/FMDownSampler.cpp
--- a/src/FM/FMDownSampler.h
+++ b/src/FM/FMDownSampler.h
--- a/src/FM/FMKeyer.cpp
+++ b/src/FM/FMKeyer.cpp
--- a/src/FM/FMKeyer.h
+++ b/src/FM/FMKeyer.h
--- a/src/FM/FMNoiseSquelch.cpp
+++ b/src/FM/FMNoiseSquelch.cpp
--- a/src/FM/FMNoiseSquelch.h
+++ b/src/FM/FMNoiseSquelch.h
--- a/src/FM/FMSamplePairPack.h
+++ b/src/FM/FMSamplePairPack.h
--- a/src/FM/FMTimeout.cpp
+++ b/src/FM/FMTimeout.cpp
--- a/src/FM/FMTimeout.h
+++ b/src/FM/FMTimeout.h
--- a/src/FM/FMTimer.cpp
+++ b/src/FM/FMTimer.cpp
--- a/src/FM/FMTimer.h
+++ b/src/FM/FMTimer.h
--- a/src/FM/FMUpSampler.cpp
+++ b/src/FM/FMUpSampler.cpp
--- a/src/FM/FMUpSampler.h
+++ b/src/FM/FMUpSampler.h
--- a/src/Globals.h
+++ b/src/Globals.h
@ -58,37 +58,38 @@ enum MMDVM_STATE {
 };
 #include "SerialPort.h"
-#include "DMRIdleRX.h"
+
-#include "DMRDMORX.h"
+#include "POCSAG/CalPOCSAG.h"
-#include "DMRDMOTX.h"
+#include "DStar/CalDStarRX.h"
-#include "DStarRX.h"
+#include "DStar/CalDStarTX.h"
-#include "DStarTX.h"
+#include "POCSAG/POCSAGTX.h"
-#include "DMRRX.h"
+#include "DStar/DStarRX.h"
-#include "DMRTX.h"
+#include "DStar/DStarTX.h"
-#include "YSFRX.h"
+#include "DMR/DMRIdleRX.h"
-#include "YSFTX.h"
+#include "DMR/DMRDMORX.h"
-#include "P25RX.h"
+#include "DMR/DMRDMOTX.h"
-#include "P25TX.h"
+#include "NXDN/CalNXDN.h"
-#include "M17RX.h"
+#include "NXDN/NXDNRX.h"
-#include "M17TX.h"
+#include "NXDN/NXDNTX.h"
-#include "NXDNRX.h"
+#include "AX25/AX25RX.h"
-#include "NXDNTX.h"
+#include "AX25/AX25TX.h"
-#include "POCSAGTX.h"
+#include "DMR/CalDMR.h"
-#include "CalDStarRX.h"
+#include "P25/CalP25.h"
-#include "CalDStarTX.h"
+#include "M17/CalM17.h"
-#include "CalFM.h"
+#include "DMR/DMRRX.h"
-#include "CalDMR.h"
+#include "DMR/DMRTX.h"
-#include "CalP25.h"
+#include "YSF/YSFRX.h"
-#include "CalNXDN.h"
+#include "YSF/YSFTX.h"
-#include "CalPOCSAG.h"
+#include "P25/P25RX.h"
 #include "P25/P25TX.h"
 #include "M17/M17RX.h"
 #include "M17/M17TX.h"
 #include "FM/CalFM.h"
 #include "CalRSSI.h"
 #include "CWIdTX.h"
-#include "AX25RX.h"
+#include "FM/FM.h"
 #include "AX25TX.h"
 #include "CalM17.h"
 #include "Debug.h"
 #include "IO.h"
 #include "FM.h"
 const uint8_t  MARK_SLOT1 = 0x08U;
 const uint8_t  MARK_SLOT2 = 0x04U;
--- a/src/M17/CalM17.cpp
+++ b/src/M17/CalM17.cpp
--- a/src/M17/CalM17.h
+++ b/src/M17/CalM17.h
--- a/src/M17/M17Defines.h
+++ b/src/M17/M17Defines.h
--- a/src/M17/M17RX.cpp
+++ b/src/M17/M17RX.cpp
--- a/src/M17/M17RX.h
+++ b/src/M17/M17RX.h
--- a/src/M17/M17TX.cpp
+++ b/src/M17/M17TX.cpp
--- a/src/M17/M17TX.h
+++ b/src/M17/M17TX.h
--- a/src/NXDN/CalNXDN.cpp
+++ b/src/NXDN/CalNXDN.cpp
--- a/src/NXDN/CalNXDN.h
+++ b/src/NXDN/CalNXDN.h
--- a/src/NXDN/NXDNDefines.h
+++ b/src/NXDN/NXDNDefines.h
--- a/src/NXDN/NXDNRX.cpp
+++ b/src/NXDN/NXDNRX.cpp
--- a/src/NXDN/NXDNRX.h
+++ b/src/NXDN/NXDNRX.h
--- a/src/NXDN/NXDNTX.cpp
+++ b/src/NXDN/NXDNTX.cpp
--- a/src/NXDN/NXDNTX.h
+++ b/src/NXDN/NXDNTX.h
--- a/src/P25/CalP25.cpp
+++ b/src/P25/CalP25.cpp
--- a/src/P25/CalP25.h
+++ b/src/P25/CalP25.h
--- a/src/P25/P25Defines.h
+++ b/src/P25/P25Defines.h
--- a/src/P25/P25RX.cpp
+++ b/src/P25/P25RX.cpp
--- a/src/P25/P25RX.h
+++ b/src/P25/P25RX.h
--- a/src/P25/P25TX.cpp
+++ b/src/P25/P25TX.cpp
--- a/src/P25/P25TX.h
+++ b/src/P25/P25TX.h
--- a/src/POCSAG/CalPOCSAG.cpp
+++ b/src/POCSAG/CalPOCSAG.cpp
--- a/src/POCSAG/CalPOCSAG.h
+++ b/src/POCSAG/CalPOCSAG.h
--- a/src/POCSAG/POCSAGTX.cpp
+++ b/src/POCSAG/POCSAGTX.cpp
--- a/src/POCSAG/POCSAGTX.h
+++ b/src/POCSAG/POCSAGTX.h
--- a/src/YSF/YSFDefines.h
+++ b/src/YSF/YSFDefines.h
--- a/src/YSF/YSFRX.cpp
+++ b/src/YSF/YSFRX.cpp
--- a/src/YSF/YSFRX.h
+++ b/src/YSF/YSFRX.h
--- a/src/YSF/YSFTX.cpp
+++ b/src/YSF/YSFTX.cpp
--- a/src/YSF/YSFTX.h
+++ b/src/YSF/YSFTX.h