put back all pieces, don't clear callsign on voice packets

hb9tob · Oct 11, 2022 · b36eab7 · b36eab7
1 parent 7c56edb
commit b36eab7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/USRP2YSF/USRP2YSF.cpp b/USRP2YSF/USRP2YSF.cpp
@@ -292,7 +292,7 @@ int CUSRP2YSF::run()
 				}
 				else if( (m_usrpFrame[20] == USRP_TYPE_VOICE) && (m_usrpFrame[15] == USRP_KEYUP_TRUE) ){
 					if(!m_usrpFrames){
-						m_usrpcs.clear();
+						//m_usrpcs.clear();
 						m_conv.putUSRPHeader();
 						LogMessage("USRP voice received as first frame");
 					}
@@ -406,7 +406,7 @@ int CUSRP2YSF::run()
 				ysf_cnt = 0U;
 
 				::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
-				::memcpy(m_ysfFrame + 4U, m_usrpcs.c_str(), YSF_CALLSIGN_LENGTH);
+				::memcpy(m_ysfFrame + 4U, m_ysfNetwork->getCallsign().c_str(), YSF_CALLSIGN_LENGTH);
 				::memcpy(m_ysfFrame + 14U, m_usrpcs.c_str(), YSF_CALLSIGN_LENGTH);
 				::memcpy(m_ysfFrame + 24U, "ALL       ", YSF_CALLSIGN_LENGTH);
 				m_ysfFrame[34U] = 0U; // Net frame counter
@@ -448,7 +448,7 @@ int CUSRP2YSF::run()
 			else if (ysfFrameType == TAG_EOT) {
 
 				::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
-				::memcpy(m_ysfFrame + 4U, m_usrpcs.c_str(), YSF_CALLSIGN_LENGTH);
+				::memcpy(m_ysfFrame + 4U, m_ysfNetwork->getCallsign().c_str(), YSF_CALLSIGN_LENGTH);
 				::memcpy(m_ysfFrame + 14U, m_usrpcs.c_str(), YSF_CALLSIGN_LENGTH);
 				::memcpy(m_ysfFrame + 24U, "ALL       ", YSF_CALLSIGN_LENGTH);
 				m_ysfFrame[34U] = ysf_cnt; // Net frame counter
@@ -492,7 +492,7 @@ int CUSRP2YSF::run()
 				unsigned int fn = (ysf_cnt - 1U) % (m_conf.getFICHFrameTotal() + 1);
 
 				::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
-				::memcpy(m_ysfFrame + 4U, m_usrpcs.c_str(), YSF_CALLSIGN_LENGTH);
+				::memcpy(m_ysfFrame + 4U, m_ysfNetwork->getCallsign().c_str(), YSF_CALLSIGN_LENGTH);
 				::memcpy(m_ysfFrame + 14U, m_usrpcs.c_str(), YSF_CALLSIGN_LENGTH);
 				::memcpy(m_ysfFrame + 24U, "ALL       ", YSF_CALLSIGN_LENGTH);