Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the FM controller status to the FM Status message.

This commit is contained in:
Jonathan Naylor 2020-05-12 15:58:54 +01:00
parent df0a9ebe72
commit 7dc420c8ff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FM.cpp
View File

@ -328,7 +328,7 @@ void CFM::clock(uint8_t length)
m_statusTimer.clock(length); m_statusTimer.clock(length);
if (m_statusTimer.isRunning() && m_statusTimer.hasExpired()) { if (m_statusTimer.isRunning() && m_statusTimer.hasExpired()) {
serial.writeFMStatus(); serial.writeFMStatus(m_state);
m_statusTimer.start(); m_statusTimer.start();
} }
} }
@ -356,7 +356,7 @@ void CFM::listeningState(bool validRFSignal, bool validExtSignal)
m_callsignTimer.start(); m_callsignTimer.start();
m_statusTimer.start(); m_statusTimer.start();
serial.writeFMStatus(); serial.writeFMStatus(m_state);
} else if (validExtSignal) { } else if (validExtSignal) {
if (m_kerchunkTimer.getTimeout() > 0U) { if (m_kerchunkTimer.getTimeout() > 0U) {
DEBUG1("State to KERCHUNK_EXT"); DEBUG1("State to KERCHUNK_EXT");
@ -378,7 +378,7 @@ void CFM::listeningState(bool validRFSignal, bool validExtSignal)
m_callsignTimer.start(); m_callsignTimer.start();
m_statusTimer.start(); m_statusTimer.start();
serial.writeFMStatus(); serial.writeFMStatus(m_state);
} }
} }
@ -731,4 +731,3 @@ void CFM::insertSilence(uint16_t ms)
for (uint32_t i = 0U; i < nSamples; i++) for (uint32_t i = 0U; i < nSamples; i++)
m_outputRFRB.put(0); m_outputRFRB.put(0);
} }

7
SerialPort.cpp
View File

@ -1263,7 +1263,7 @@ void CSerialPort::writeFMData(const uint8_t* data, uint8_t length)
writeInt(1U, reply, count); writeInt(1U, reply, count);
} }
void CSerialPort::writeFMStatus() void CSerialPort::writeFMStatus(uint8_t status)
{ {
if (m_modemState != STATE_FM && m_modemState != STATE_IDLE) if (m_modemState != STATE_FM && m_modemState != STATE_IDLE)
return; return;
@ -1274,10 +1274,11 @@ void CSerialPort::writeFMStatus()
uint8_t reply[10U]; uint8_t reply[10U];
reply[0U] = MMDVM_FRAME_START; reply[0U] = MMDVM_FRAME_START;
reply[1U] = 3U; reply[1U] = 4U;
reply[2U] = MMDVM_FM_STATUS; reply[2U] = MMDVM_FM_STATUS;
reply[3U] = status;
writeInt(1U, reply, 3); writeInt(1U, reply, 4);
} }
void CSerialPort::writeCalData(const uint8_t* data, uint8_t length) void CSerialPort::writeCalData(const uint8_t* data, uint8_t length)

2
SerialPort.h
View File

@ -51,7 +51,7 @@ public:
void writeNXDNLost(); void writeNXDNLost();
void writeFMData(const uint8_t* data, uint8_t length); void writeFMData(const uint8_t* data, uint8_t length);
void writeFMStatus(); void writeFMStatus(uint8_t status);
void writeCalData(const uint8_t* data, uint8_t length); void writeCalData(const uint8_t* data, uint8_t length);
void writeRSSIData(const uint8_t* data, uint8_t length); void writeRSSIData(const uint8_t* data, uint8_t length);