Change the LinkMode state machine.

FM.cpp

@@ -66,7 +66,9 @@ m_extEnabled(false),
 m_rxLevel(1),
 m_inputRFRB(2401U),   // 100ms of audio + 1 sample
 m_outputRFRB(2400U),  // 100ms of audio
-m_inputExtRB()
+m_inputExtRB(),
+m_rfSignal(false),
+m_extSignal(false)
 {
   m_statusTimer.setTimeout(1U, 0U);
   m_reverseTimer.setTimeout(0U, 150U);
@@ -158,6 +160,20 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
     if (m_modemState != STATE_FM)
       continue;
 
+    q15_t currentSample;
+
+    if (m_linkMode) {
+      if (m_rfSignal && m_extEnabled) {
+        q15_t currentSample = m_blanking.process(currentRFSample);
+        m_downSampler.addSample(currentSample);
+      }
+
+      if (m_extSignal)
+        currentSample = currentExtSample * m_extAudioBoost;
+
+      if (!m_extSignal)
+        continue;
+    } else {
       if (m_state == FS_LISTENING && !m_rfAck.isWanted() && !m_extAck.isWanted() && !m_callsign.isWanted() && !m_reverseTimer.isRunning())
         continue;
 
@@ -188,6 +204,7 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
           continue; 
         }
       }
+    }
 
     if (!m_callsign.isRunning() && !m_extAck.isRunning())
       currentSample += m_rfAck.getHighAudio();
@@ -281,6 +298,8 @@ void CFM::reset()
   m_squelch.reset();
   
   m_needReverse = false;
+  m_rfSignal    = false;
+  m_extSignal   = false;
 }
 
 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)
@@ -1010,65 +1029,58 @@ void CFM::timeoutExtWaitStateSimplex(bool validSignal)
 
 void CFM::linkStateMachine(bool validRFSignal, bool validExtSignal)
 {
-  switch (m_state) {
+  if (validRFSignal && !m_rfSignal) {
-    case FS_LISTENING:
-      if (validRFSignal) {
     io.setDecode(true);
     io.setADCDetection(true);
 
-        if (m_duplex)
+    if (!m_extSignal) {
-          insertSilence(50U);
-
       DEBUG1("State to RELAYING_RF");
       m_state = FS_RELAYING_RF;
-
-        m_statusTimer.start();
-        serial.writeFMStatus(m_state);
-      } else if (validExtSignal) {
-        io.setDecode(true);
-        io.setADCDetection(true);
-
-        insertSilence(50U);
-
-        DEBUG1("State to RELAYING_EXT");
-        m_state = FS_RELAYING_EXT;
-
       m_statusTimer.start();
       serial.writeFMStatus(m_state);
     }
-      break;
 
-    case FS_RELAYING_RF:
+    m_rfSignal = true;
-      if (!validRFSignal) {
+  }
+
+  if (validExtSignal && !m_extSignal) {
+    if (!m_rfSignal) {
+      DEBUG1("State to RELAYING_EXT");
+      m_state = FS_RELAYING_EXT;
+      m_statusTimer.start();
+      serial.writeFMStatus(m_state);
+    }
+
+    insertSilence(50U);
+
+    m_extSignal = true;
+  }
+
+  if (!validRFSignal && m_rfSignal) {
     io.setDecode(false);
     io.setADCDetection(false);
 
+    if (!m_extSignal) {
       DEBUG1("State to LISTENING");
       m_state = FS_LISTENING;
+      m_statusTimer.stop();
+    }
+
+    m_rfSignal = false;
 
     if (m_extEnabled)
       serial.writeFMEOT();
-
-        if (m_duplex)
-          m_needReverse = true;
-
-        m_statusTimer.stop();
   }
-      break;
-
-    case FS_RELAYING_EXT:
-      if (!validExtSignal) {
-        io.setDecode(false);
-        io.setADCDetection(false);
 
+  if (!validExtSignal && m_extSignal) {
+    if (!m_rfSignal) {
       DEBUG1("State to LISTENING");
       m_state = FS_LISTENING;
-
-        m_needReverse = true;
-
       m_statusTimer.stop();
     }
-      break;
+
+    m_needReverse = true;
+    m_extSignal   = false;
   }
 }
 

FM.h

@@ -108,6 +108,8 @@ private:
   CRingBuffer<q15_t>   m_inputRFRB;
   CRingBuffer<q15_t>   m_outputRFRB;
   CFMUpSampler         m_inputExtRB;
+  bool                 m_rfSignal;
+  bool                 m_extSignal;
 
   void stateMachine(bool validRFSignal, bool validExtSignal);