MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 09:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

M17 and AX.25 removal cleanups.

Browse Source
This commit is contained in:
Jonathan Naylor
2025-08-27 17:51:15 +01:00
parent d085ca8b0f
commit 1e2e0c7431
8 changed files with 10 additions and 1466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Modem.h
View File

@@ -47,8 +47,8 @@ public:
void setPort(IModemPort* port);
void setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency);
void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool m17Enabled, bool pocsagEnabled, bool fmEnabled, bool ax25Enabled);
void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float m17TXLevel, float pocsagLevel, float fmTXLevel, float ax25TXLevel);
void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool pocsagEnabled, bool fmEnabled);
void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel, float fmTXLevel);
#if defined(USE_DMR)
void setDMRParams(unsigned int colorCode);
@@ -61,12 +61,6 @@ public:
#endif
#if defined(USE_NXDN)
void setNXDNParams(unsigned int txHang);
#endif
#if defined(USE_M17)
void setM17Params(unsigned int txHang);
#endif
#if defined(USE_AX25)
void setAX25Params(int rxTwist, unsigned int txDelay, unsigned int slotTime, unsigned int pPersist);
#endif
void setTransparentDataParams(unsigned int sendFrameType);
@@ -105,15 +99,9 @@ public:
#if defined(USE_NXDN)
unsigned int readNXDNData(unsigned char* data);
#endif
#if defined(USE_M17)
unsigned int readM17Data(unsigned char* data);
#endif
#if defined(USE_FM)
unsigned int readFMData(unsigned char* data);
#endif
#if defined(USE_AX25)
unsigned int readAX25Data(unsigned char* data);
#endif
#if defined(USE_DSTAR)
bool hasDStarSpace() const;
@@ -131,18 +119,12 @@ public:
#if defined(USE_NXDN)
bool hasNXDNSpace() const;
#endif
#if defined(USE_M17)
bool hasM17Space() const;
#endif
#if defined(USE_POCSAG)
bool hasPOCSAGSpace() const;
#endif
#if defined(USE_FM)
unsigned int getFMSpace() const;
#endif
#if defined(USE_AX25)
bool hasAX25Space() const;
#endif
bool hasTX() const;
bool hasCD() const;
@@ -168,18 +150,12 @@ public:
#if defined(USE_NXDN)
bool writeNXDNData(const unsigned char* data, unsigned int length);
#endif
#if defined(USE_M17)
bool writeM17Data(const unsigned char* data, unsigned int length);
#endif
#if defined(USE_POCSAG)
bool writePOCSAGData(const unsigned char* data, unsigned int length);
#endif
#if defined(USE_FM)
bool writeFMData(const unsigned char* data, unsigned int length);
#endif
#if defined(USE_AX25)
bool writeAX25Data(const unsigned char* data, unsigned int length);
#endif
#if defined(USE_DSTAR)
bool writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
@@ -196,9 +172,6 @@ public:
#if defined(USE_NXDN)
bool writeNXDNInfo(const char* source, bool group, unsigned int dest, const char* type);
#endif
#if defined(USE_M17)
bool writeM17Info(const char* source, const char* dest, const char* type);
#endif
#if defined(USE_POCSAG)
bool writePOCSAGInfo(unsigned int ric, const std::string& message);
#endif
@@ -240,9 +213,6 @@ private:
#endif
#if defined(USE_NXDN)
unsigned int m_nxdnTXHang;
#endif
#if defined(USE_M17)
unsigned int m_m17TXHang;
#endif
bool m_duplex;
bool m_rxInvert;
@@ -269,17 +239,11 @@ private:
#if defined(USE_NXDN)
float m_nxdnTXLevel;
#endif
#if defined(USE_M17)
float m_m17TXLevel;
#endif
#if defined(USE_POCSAG)
float m_pocsagTXLevel;
#endif
#if defined(USE_FM)
float m_fmTXLevel;
#endif
#if defined(USE_AX25)
float m_ax25TXLevel;
#endif
float m_rfLevel;
bool m_useCOSAsLockout;
@@ -305,17 +269,11 @@ private:
#if defined(USE_NXDN)
bool m_nxdnEnabled;
#endif
#if defined(USE_M17)
bool m_m17Enabled;
#endif
#if defined(USE_POCSAG)
bool m_pocsagEnabled;
#endif
#if defined(USE_FM)
bool m_fmEnabled;
#endif
#if defined(USE_AX25)
bool m_ax25Enabled;
#endif
int m_rxDCOffset;
int m_txDCOffset;
@@ -348,20 +306,12 @@ private:
CRingBuffer<unsigned char> m_rxNXDNData;
CRingBuffer<unsigned char> m_txNXDNData;
#endif
#if defined(USE_M17)
CRingBuffer<unsigned char> m_rxM17Data;
CRingBuffer<unsigned char> m_txM17Data;
#endif
#if defined(USE_POCSAG)
CRingBuffer<unsigned char> m_txPOCSAGData;
#endif
#if defined(USE_FM)
CRingBuffer<unsigned char> m_rxFMData;
CRingBuffer<unsigned char> m_txFMData;
#endif
#if defined(USE_AX25)
CRingBuffer<unsigned char> m_rxAX25Data;
CRingBuffer<unsigned char> m_txAX25Data;
#endif
CRingBuffer<unsigned char> m_rxSerialData;
CRingBuffer<unsigned char> m_txSerialData;
@@ -387,17 +337,11 @@ private:
#if defined(USE_NXDN)
unsigned int m_nxdnSpace;
#endif
#if defined(USE_M17)
unsigned int m_m17Space;
#endif
#if defined(USE_POCSAG)
unsigned int m_pocsagSpace;
#endif
#if defined(USE_FM)
unsigned int m_fmSpace;
#endif
#if defined(USE_AX25)
unsigned int m_ax25Space;
#endif
bool m_tx;
bool m_cd;
@@ -405,12 +349,6 @@ private:
bool m_error;
unsigned char m_mode;
HW_TYPE m_hwType;
#if defined(USE_AX25)
int m_ax25RXTwist;
unsigned int m_ax25TXDelay;
unsigned int m_ax25SlotTime;
unsigned int m_ax25PPersist;
#endif
#if defined(USE_FM)
std::string m_fmCallsign;
unsigned int m_fmCallsignSpeed;