MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-05 14:15:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the interface to the FM networking.

Browse Source
This commit is contained in:
Jonathan Naylor
2024-02-01 13:31:04 +00:00
parent 73084ed734
commit 6420391294
10 changed files with 236 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
FMControl.cpp
View File

@@ -40,6 +40,7 @@ m_rxAudioGain(rxAudioGain),
m_preEmphasisOn(preEmphasisOn), m_preEmphasisOn(preEmphasisOn),
m_deEmphasisOn(deEmphasisOn), m_deEmphasisOn(deEmphasisOn),
m_enabled(false), m_enabled(false),
m_begin(true),
m_incomingRFAudio(1600U, "Incoming RF FM Audio"), m_incomingRFAudio(1600U, "Incoming RF FM Audio"),
m_preEmphasis(NULL), m_preEmphasis(NULL),
m_deEmphasis(NULL), m_deEmphasis(NULL),
@@ -80,12 +81,19 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
if (data[0U] == TAG_HEADER) if (data[0U] == TAG_HEADER)
return true; return true;
if (data[0U] == TAG_EOT) if (data[0U] == TAG_EOT) {
m_begin = true;
return m_network->writeEnd(); return m_network->writeEnd();
}
if (data[0U] != TAG_DATA) if (data[0U] != TAG_DATA)
return false; return false;
if (m_begin) {
m_begin = false;
m_network->writeStart();
}
m_incomingRFAudio.addData(data + 1U, length - 1U); m_incomingRFAudio.addData(data + 1U, length - 1U);
unsigned int bufferLength = m_incomingRFAudio.dataSize(); unsigned int bufferLength = m_incomingRFAudio.dataSize();
if (bufferLength > 240U) // 160 samples 12-bit if (bufferLength > 240U) // 160 samples 12-bit
@@ -109,7 +117,7 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
packPointer[2U] = bufferData[i + 2U]; packPointer[2U] = bufferData[i + 2U];
unpackedSamples[1U] = short(int(pack & FM_MASK) - 2048); unpackedSamples[1U] = short(int(pack & FM_MASK) - 2048);
unpackedSamples[0U] = short(int(pack >> 12 & FM_MASK) - 2048); // unpackedSamples[0U] = short(int(pack >> 12 & FM_MASK) - 2048);
// Process unpacked sample pair // Process unpacked sample pair
for (unsigned char j = 0U; j < 2U; j++) { for (unsigned char j = 0U; j < 2U; j++) {
@@ -125,10 +133,10 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
} }
#if defined(DUMP_RF_AUDIO) #if defined(DUMP_RF_AUDIO)
FILE * audiofile = fopen("./audiodump.bin", "ab"); FILE* audiofile = ::fopen("./audiodump.bin", "ab");
if (audiofile != NULL) { if (audiofile != NULL) {
fwrite(out, sizeof(float), nOut, audiofile); ::fwrite(out, sizeof(float), nOut, audiofile);
fclose(audiofile); ::fclose(audiofile);
} }
#endif #endif
return m_network->writeData(out, nOut); return m_network->writeData(out, nOut);

3
FMControl.h
View File

@@ -49,7 +49,10 @@ private:
bool m_preEmphasisOn; bool m_preEmphasisOn;
bool m_deEmphasisOn; bool m_deEmphasisOn;
bool m_enabled; bool m_enabled;
bool m_begin;
CRingBuffer<unsigned char> m_incomingRFAudio; CRingBuffer<unsigned char> m_incomingRFAudio;
CIIRDirectForm1Filter* m_preEmphasis; CIIRDirectForm1Filter* m_preEmphasis;
CIIRDirectForm1Filter* m_deEmphasis; CIIRDirectForm1Filter* m_deEmphasis;
CIIRDirectForm1Filter* m_filterStage1; CIIRDirectForm1Filter* m_filterStage1;

33
FMIAXNetwork.cpp
View File

@@ -152,17 +152,16 @@ bool CFMIAXNetwork::open()
return m_socket.open(m_addr); return m_socket.open(m_addr);
} }
bool CFMIAXNetwork::writeStart()
{
return true;
}
bool CFMIAXNetwork::writeData(const float* data, unsigned int nSamples) bool CFMIAXNetwork::writeData(const float* data, unsigned int nSamples)
{ {
assert(data != NULL); assert(data != NULL);
assert(nSamples > 0U); assert(nSamples > 0U);
/*
if (m_iSeqNo == 0U) {
bool ret = writeStart();
if (!ret)
return false;
}
*/
return true; return true;
} }
@@ -193,20 +192,6 @@ void CFMIAXNetwork::clock(unsigned int ms)
if (m_debug) if (m_debug)
CUtils::dump(1U, "FM IAX Network Data Received", buffer, length); CUtils::dump(1U, "FM IAX Network Data Received", buffer, length);
// Invalid packet type?
if (::memcmp(buffer, "USRP", 4U) != 0)
return;
if (length < 32)
return;
// The type is a big-endian 4-byte integer
unsigned int type = (buffer[20U] << 24) +
(buffer[21U] << 16) +
(buffer[22U] << 8) +
(buffer[23U] << 0);
if (type == 0U)
m_buffer.addData(buffer + 32U, length - 32U); m_buffer.addData(buffer + 32U, length - 32U);
} }
@@ -257,7 +242,7 @@ void CFMIAXNetwork::enable(bool enabled)
bool CFMIAXNetwork::writeCall() bool CFMIAXNetwork::writeCall()
{ {
unsigned short sCall = ++m_sCallNo | 0x8000; unsigned short sCall = ++m_sCallNo | 0x8000U;
m_timestamp.start(); m_timestamp.start();
@@ -329,7 +314,7 @@ bool CFMIAXNetwork::writeAuth()
char hash[MD5_DIGEST_STRING_LENGTH]; char hash[MD5_DIGEST_STRING_LENGTH];
::MD5Data((unsigned char*)m_password.c_str(), m_password.size(), hash); ::MD5Data((unsigned char*)m_password.c_str(), m_password.size(), hash);
unsigned short sCall = m_sCallNo | 0x8000; unsigned short sCall = m_sCallNo | 0x8000U;
unsigned int ts = m_timestamp.elapsed(); unsigned int ts = m_timestamp.elapsed();
unsigned char buffer[50U]; unsigned char buffer[50U];
@@ -543,7 +528,7 @@ bool CFMIAXNetwork::writeDisconnect()
{ {
const char* REASON = "MMDVM Out"; const char* REASON = "MMDVM Out";
unsigned short sCall = m_sCallNo | 0x8000; unsigned short sCall = m_sCallNo | 0x8000U;
unsigned int ts = m_timestamp.elapsed(); unsigned int ts = m_timestamp.elapsed();
unsigned char buffer[50U]; unsigned char buffer[50U];

2
FMIAXNetwork.h
View File

@@ -36,6 +36,8 @@ public:
virtual void enable(bool enabled); virtual void enable(bool enabled);
virtual bool writeStart();
virtual bool writeData(const float* data, unsigned int nSamples); virtual bool writeData(const float* data, unsigned int nSamples);
virtual bool writeEnd(); virtual bool writeEnd();

2
FMNetwork.h
View File

@@ -30,6 +30,8 @@ public:
virtual void enable(bool enabled) = 0; virtual void enable(bool enabled) = 0;
virtual bool writeStart() = 0;
virtual bool writeData(const float* data, unsigned int nSamples) = 0; virtual bool writeData(const float* data, unsigned int nSamples) = 0;
virtual bool writeEnd() = 0; virtual bool writeEnd() = 0;

37
FMRAWNetwork.cpp
View File

@@ -43,7 +43,6 @@ m_squelchFile(squelchFile),
m_debug(debug), m_debug(debug),
m_enabled(false), m_enabled(false),
m_buffer(2000U, "FM Network"), m_buffer(2000U, "FM Network"),
m_seqNo(0U),
m_resampler(NULL), m_resampler(NULL),
m_error(0), m_error(0),
m_fd(-1) m_fd(-1)
@@ -83,17 +82,24 @@ bool CFMRAWNetwork::open()
return m_socket.open(m_addr); return m_socket.open(m_addr);
} }
bool CFMRAWNetwork::writeStart()
{
if (m_fd != -1) {
size_t n = ::write(m_fd, "O", 1);
if (n != 1) {
LogError("Cannot write to the squelch file: %s, errno=%d", m_squelchFile.c_str(), errno);
return false;
}
}
return true;
}
bool CFMRAWNetwork::writeData(const float* in, unsigned int nIn) bool CFMRAWNetwork::writeData(const float* in, unsigned int nIn)
{ {
assert(in != NULL); assert(in != NULL);
assert(nIn > 0U); assert(nIn > 0U);
if (m_seqNo == 0U) {
bool ret = writeStart();
if (!ret)
return false;
}
unsigned char buffer[2000U]; unsigned char buffer[2000U];
unsigned int length = 0U; unsigned int length = 0U;
@@ -135,15 +141,11 @@ bool CFMRAWNetwork::writeData(const float* in, unsigned int nIn)
if (m_debug) if (m_debug)
CUtils::dump(1U, "FM RAW Network Data Sent", buffer, length); CUtils::dump(1U, "FM RAW Network Data Sent", buffer, length);
m_seqNo++;
return m_socket.write(buffer, length, m_addr, m_addrLen); return m_socket.write(buffer, length, m_addr, m_addrLen);
} }
bool CFMRAWNetwork::writeEnd() bool CFMRAWNetwork::writeEnd()
{ {
m_seqNo = 0U;
if (m_fd != -1) { if (m_fd != -1) {
size_t n = ::write(m_fd, "Z", 1); size_t n = ::write(m_fd, "Z", 1);
if (n != 1) { if (n != 1) {
@@ -262,16 +264,3 @@ void CFMRAWNetwork::enable(bool enabled)
m_enabled = enabled; m_enabled = enabled;
} }
bool CFMRAWNetwork::writeStart()
{
if (m_fd != -1) {
size_t n = ::write(m_fd, "O", 1);
if (n != 1) {
LogError("Cannot write to the squelch file: %s, errno=%d", m_squelchFile.c_str(), errno);
return false;
}
}
return true;
}

5
FMRAWNetwork.h
View File

@@ -37,6 +37,8 @@ public:
virtual void enable(bool enabled); virtual void enable(bool enabled);
virtual bool writeStart();
virtual bool writeData(const float* in, unsigned int nIn); virtual bool writeData(const float* in, unsigned int nIn);
virtual bool writeEnd(); virtual bool writeEnd();
@@ -58,12 +60,9 @@ private:
bool m_debug; bool m_debug;
bool m_enabled; bool m_enabled;
CRingBuffer<unsigned char> m_buffer; CRingBuffer<unsigned char> m_buffer;
unsigned int m_seqNo;
SRC_STATE* m_resampler; SRC_STATE* m_resampler;
int m_error; int m_error;
int m_fd; int m_fd;
bool writeStart();
}; };
#endif #endif

200
FMUSRPNetwork.cpp
View File

@@ -71,17 +71,108 @@ bool CFMUSRPNetwork::open()
return m_socket.open(m_addr); return m_socket.open(m_addr);
} }
bool CFMUSRPNetwork::writeStart()
{
unsigned char buffer[500U];
::memset(buffer, 0x00U, 500U);
unsigned int length = 0U;
buffer[length++] = 'U';
buffer[length++] = 'S';
buffer[length++] = 'R';
buffer[length++] = 'P';
// Sequence number
buffer[length++] = (m_seqNo >> 24) & 0xFFU;
buffer[length++] = (m_seqNo >> 16) & 0xFFU;
buffer[length++] = (m_seqNo >> 8) & 0xFFU;
buffer[length++] = (m_seqNo >> 0) & 0xFFU;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// PTT off
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Type, 2 for metadata
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x02U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// TLV TAG for Metadata
buffer[length++] = 0x08U;
// TLV Length
buffer[length++] = 3U + 4U + 3U + 1U + 1U + m_callsign.size() + 1U;
// DMR Id
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Rpt Id
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Talk Group
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Time Slot
buffer[length++] = 0x00U;
// Color Code
buffer[length++] = 0x00U;
// Callsign
for (std::string::const_iterator it = m_callsign.cbegin(); it != m_callsign.cend(); ++it)
buffer[length++] = *it;
// End of Metadata
buffer[length++] = 0x00U;
length = 70U;
if (length > 0U) {
if (m_debug)
CUtils::dump(1U, "FM USRP Network Data Sent", buffer, length);
return m_socket.write(buffer, length, m_addr, m_addrLen);
} else {
return true;
}
}
bool CFMUSRPNetwork::writeData(const float* data, unsigned int nSamples) bool CFMUSRPNetwork::writeData(const float* data, unsigned int nSamples)
{ {
assert(data != NULL); assert(data != NULL);
assert(nSamples > 0U); assert(nSamples > 0U);
if (m_seqNo == 0U) {
bool ret = writeStart();
if (!ret)
return false;
}
unsigned char buffer[500U]; unsigned char buffer[500U];
::memset(buffer, 0x00U, 500U); ::memset(buffer, 0x00U, 500U);
@@ -293,100 +384,3 @@ void CFMUSRPNetwork::enable(bool enabled)
m_enabled = enabled; m_enabled = enabled;
} }
bool CFMUSRPNetwork::writeStart()
{
unsigned char buffer[500U];
::memset(buffer, 0x00U, 500U);
unsigned int length = 0U;
buffer[length++] = 'U';
buffer[length++] = 'S';
buffer[length++] = 'R';
buffer[length++] = 'P';
// Sequence number
buffer[length++] = (m_seqNo >> 24) & 0xFFU;
buffer[length++] = (m_seqNo >> 16) & 0xFFU;
buffer[length++] = (m_seqNo >> 8) & 0xFFU;
buffer[length++] = (m_seqNo >> 0) & 0xFFU;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// PTT off
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Type, 2 for metadata
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x02U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// TLV TAG for Metadata
buffer[length++] = 0x08U;
// TLV Length
buffer[length++] = 3U + 4U + 3U + 1U + 1U + m_callsign.size() + 1U;
// DMR Id
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Rpt Id
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Talk Group
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
// Time Slot
buffer[length++] = 0x00U;
// Color Code
buffer[length++] = 0x00U;
// Callsign
for (std::string::const_iterator it = m_callsign.cbegin(); it != m_callsign.cend(); ++it)
buffer[length++] = *it;
// End of Metadata
buffer[length++] = 0x00U;
length = 70U;
if (length > 0U) {
if (m_debug)
CUtils::dump(1U, "FM USRP Network Data Sent", buffer, length);
return m_socket.write(buffer, length, m_addr, m_addrLen);
} else {
return true;
}
}

4
FMUSRPNetwork.h
View File

@@ -35,6 +35,8 @@ public:
virtual void enable(bool enabled); virtual void enable(bool enabled);
virtual bool writeStart();
virtual bool writeData(const float* data, unsigned int nSamples); virtual bool writeData(const float* data, unsigned int nSamples);
virtual bool writeEnd(); virtual bool writeEnd();
@@ -56,8 +58,6 @@ private:
bool m_enabled; bool m_enabled;
CRingBuffer<unsigned char> m_buffer; CRingBuffer<unsigned char> m_buffer;
unsigned int m_seqNo; unsigned int m_seqNo;
bool writeStart();
}; };
#endif #endif

2
Modem.cpp
View File

@@ -737,7 +737,7 @@ void CModem::clock(unsigned int ms)
unsigned int data1 = m_length - m_offset + 1U; unsigned int data1 = m_length - m_offset + 1U;
m_rxFMData.addData((unsigned char*)&data1, sizeof(unsigned int)); m_rxFMData.addData((unsigned char*)&data1, sizeof(unsigned int));
unsigned char data2= TAG_HEADER; unsigned char data2 = TAG_HEADER;
m_rxFMData.addData(&data2, 1U); m_rxFMData.addData(&data2, 1U);
m_rxFMData.addData(m_buffer + m_offset, m_length - m_offset); m_rxFMData.addData(m_buffer + m_offset, m_length - m_offset);