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

Allow the start callsign to occur when the kerchunk timer has latched.

This commit is contained in:
Jonathan Naylor 2020-05-04 22:18:51 +01:00
parent 915be8c279
commit aa7a484c7a
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FM.cpp
View File

@ -29,6 +29,7 @@ m_timeoutTone(),
m_state(FS_LISTENING), m_state(FS_LISTENING),
m_callsignAtStart(false), m_callsignAtStart(false),
m_callsignAtEnd(false), m_callsignAtEnd(false),
m_callsignAtLatch(false),
m_callsignTimer(), m_callsignTimer(),
m_timeoutTimer(), m_timeoutTimer(),
m_holdoffTimer(), m_holdoffTimer(),
@ -140,10 +141,11 @@ void CFM::reset()
m_timeoutTone.stop(); m_timeoutTone.stop();
} }
uint8_t CFM::setCallsign(const char* callsign, uint8_t speed, uint16_t frequency, uint8_t time, uint8_t holdoff, uint8_t highLevel, uint8_t lowLevel, bool callsignAtStart, bool callsignAtEnd) uint8_t CFM::setCallsign(const char* callsign, uint8_t speed, uint16_t frequency, uint8_t time, uint8_t holdoff, uint8_t highLevel, uint8_t lowLevel, bool callsignAtStart, bool callsignAtEnd, bool callsignAtLatch)
{ {
m_callsignAtStart = callsignAtStart; m_callsignAtStart = callsignAtStart;
m_callsignAtEnd = callsignAtEnd; m_callsignAtEnd = callsignAtEnd;
m_callsignAtLatch = callsignAtLatch;
uint16_t holdoffTime = holdoff * 60U; uint16_t holdoffTime = holdoff * 60U;
uint16_t callsignTime = time * 60U; uint16_t callsignTime = time * 60U;
@ -246,6 +248,8 @@ void CFM::listeningState(bool validSignal)
DEBUG1("State to KERCHUNK"); DEBUG1("State to KERCHUNK");
m_state = FS_KERCHUNK; m_state = FS_KERCHUNK;
m_kerchunkTimer.start(); m_kerchunkTimer.start();
if (m_callsignAtStart && !m_callsignAtLatch)
sendCallsign();
} else { } else {
DEBUG1("State to RELAYING"); DEBUG1("State to RELAYING");
m_state = FS_RELAYING; m_state = FS_RELAYING;
@ -269,6 +273,10 @@ void CFM::kerchunkState(bool validSignal)
DEBUG1("State to RELAYING"); DEBUG1("State to RELAYING");
m_state = FS_RELAYING; m_state = FS_RELAYING;
m_kerchunkTimer.stop(); m_kerchunkTimer.stop();
if (m_callsignAtStart && m_callsignAtLatch) {
sendCallsign();
m_callsignTimer.start();
}
} }
} else { } else {
DEBUG1("State to LISTENING"); DEBUG1("State to LISTENING");

3
FM.h
View File

@ -53,7 +53,7 @@ public:
void reset(); void reset();
uint8_t setCallsign(const char* callsign, uint8_t speed, uint16_t frequency, uint8_t time, uint8_t holdoff, uint8_t highLevel, uint8_t lowLevel, bool callsignAtStart, bool callsignAtEnd); uint8_t setCallsign(const char* callsign, uint8_t speed, uint16_t frequency, uint8_t time, uint8_t holdoff, uint8_t highLevel, uint8_t lowLevel, bool callsignAtStart, bool callsignAtEnd, bool callsignAtLatch);
uint8_t setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_t minTime, uint16_t delay, uint8_t level); uint8_t setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_t minTime, uint16_t delay, uint8_t level);
uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel); uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, bool useCOS, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel);
@ -66,6 +66,7 @@ private:
FM_STATE m_state; FM_STATE m_state;
bool m_callsignAtStart; bool m_callsignAtStart;
bool m_callsignAtEnd; bool m_callsignAtEnd;
bool m_callsignAtLatch;
CFMTimer m_callsignTimer; CFMTimer m_callsignTimer;
CFMTimer m_timeoutTimer; CFMTimer m_timeoutTimer;
CFMTimer m_holdoffTimer; CFMTimer m_holdoffTimer;

3
SerialPort.cpp
View File

@ -376,6 +376,7 @@ uint8_t CSerialPort::setFMParams1(const uint8_t* data, uint8_t length)
bool callAtStart = (data[6U] & 0x01U) == 0x01U; bool callAtStart = (data[6U] & 0x01U) == 0x01U;
bool callAtEnd = (data[6U] & 0x02U) == 0x02U; bool callAtEnd = (data[6U] & 0x02U) == 0x02U;
bool callAtLatch = (data[6U] & 0x04U) == 0x04U;
char callsign[50U]; char callsign[50U];
uint8_t n = 0U; uint8_t n = 0U;
@ -383,7 +384,7 @@ uint8_t CSerialPort::setFMParams1(const uint8_t* data, uint8_t length)
callsign[n] = data[i]; callsign[n] = data[i];
callsign[n] = '\0'; callsign[n] = '\0';
return fm.setCallsign(callsign, speed, frequency, time, holdoff, highLevel, lowLevel, callAtStart, callAtEnd); return fm.setCallsign(callsign, speed, frequency, time, holdoff, highLevel, lowLevel, callAtStart, callAtEnd, callAtLatch);
} }
uint8_t CSerialPort::setFMParams2(const uint8_t* data, uint8_t length) uint8_t CSerialPort::setFMParams2(const uint8_t* data, uint8_t length)