Skip to content

Commit

Permalink
callsign fixes for m172ysf
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbehnke
dbehnke committed Oct 14, 2022
1 parent b36eab7 commit e31ea5a
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 11 deletions.
57 changes: 48 additions & 9 deletions M172YSF/M172YSF.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
* Copyright (C) 2018 by Andy Uribe CA6JAU
* Copyright (C) 2020 by Doug McLain AD8DP
* Copyright (C) 2022 by Dave Behnke AC8ZD
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -97,6 +98,26 @@ void decode_callsign(uint8_t *callsign)
}
}

//trim is necessary over usrp, especially USRP2M17, since people put wonky
//calls in their radio like AC8ZD/DAVE. By default, callsigns coming in from YSF
//are 10 characters and padded with spaces if callsign isn't that long.
//to make it extra M17 friendly, we ensure the callsign is no longer than 8 characters.
std::string trim_callsign(const std::string s) {
const std::string ACCEPTABLECHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
size_t start = s.find_first_not_of(ACCEPTABLECHARS);
if (start > 8) {
start = 8;
}
return s.substr(0, start);
}

//pad is necessary for the reverse back to ysf, the callsign needs to be 10 characters
//spaces need to be placed if all 10 characters not used.
void pad_callsign(std::string &str, const size_t num, const char paddingChar = ' ')
{
if(num > str.size())
str.insert(str.size(), num - str.size(), paddingChar);
}

int main(int argc, char** argv)
{
Expand Down Expand Up @@ -337,6 +358,7 @@ int CM172YSF::run()
else if (m_m17Frame[34U] & 0x80U) {
LogMessage("M17 received end of voice transmission, %.1f seconds", float(m_m17Frames) / 25.0F);
m_conv.putM17EOT();
m_m17cs.clear();
}
else{
m_conv.putM17(m_m17Frame);
Expand All @@ -346,6 +368,8 @@ int CM172YSF::run()
decode_callsign(cs);
std::string css((char *)cs);
css = css.substr(0, css.find(' '));
pad_callsign(css, 10, ' ');
m_m17cs = css;
m_m17Frames++;
}
}
Expand All @@ -368,10 +392,12 @@ int CM172YSF::run()

if (fi == YSF_FI_HEADER) {
if (ysfPayload.processHeaderData(buffer + 35U)) {
std::string ysfSrc = ysfPayload.getSource();
std::string ysfSrcRaw = ysfPayload.getSource();
std::string ysfSrc = trim_callsign(ysfSrcRaw);
std::string ysfDst = ysfPayload.getDest();
LogMessage("Received YSF Header: Src: %s Dst: %s", ysfSrc.c_str(), ysfDst.c_str());
m_conv.putYSFHeader();
m_ysfcs = ysfSrc;
}
} else if (fi == YSF_FI_TERMINATOR) {
LogMessage("YSF received end of voice transmission");
Expand All @@ -385,8 +411,21 @@ int CM172YSF::run()
}

if (m17Watch.elapsed() > M17_FRAME_PER) {
unsigned int m17FrameType = m_conv.getM17(m_m17Frame);
uint32_t m17FrameType = m_conv.getM17(m_m17Frame);

if( (m_ysfcs.size()) > 3 && (m_ysfcs.size() < 8) ){
memset(m17_src, ' ', 9);
memcpy(m17_src, m_ysfcs.c_str(), m_ysfcs.size());
m17_src[8] = 'D';
m17_src[9] = 0x00;
encode_callsign(m17_src);
}
else{
memcpy(m17_src, m_callsign.c_str(), 9);
m17_src[9] = 0x00;
encode_callsign(m17_src);
}

if(m17FrameType == TAG_HEADER) {
m17_cnt = 0U;
m17Watch.start();
Expand Down Expand Up @@ -443,7 +482,7 @@ int CM172YSF::run()

::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
::memcpy(m_ysfFrame + 4U, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 14U, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 14U, m_m17cs.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 24U, "ALL ", YSF_CALLSIGN_LENGTH);
m_ysfFrame[34U] = 0U; // Net frame counter

Expand All @@ -470,7 +509,7 @@ int CM172YSF::run()
memset(csd1, '*', YSF_CALLSIGN_LENGTH);
memset(csd1, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, m_conf.getYsfRadioID().c_str(), YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_m17cs.c_str(), YSF_CALLSIGN_LENGTH);
memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);

CYSFPayload payload;
Expand All @@ -485,7 +524,7 @@ int CM172YSF::run()

::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
::memcpy(m_ysfFrame + 4U, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 14U, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 14U, m_m17cs.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 24U, "ALL ", YSF_CALLSIGN_LENGTH);
m_ysfFrame[34U] = ysf_cnt; // Net frame counter

Expand All @@ -511,7 +550,7 @@ int CM172YSF::run()
unsigned char csd1[20U], csd2[20U];
memset(csd1, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, m_conf.getYsfRadioID().c_str(), YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_m17cs.c_str(), YSF_CALLSIGN_LENGTH);
memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);

CYSFPayload payload;
Expand All @@ -529,7 +568,7 @@ int CM172YSF::run()

::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
::memcpy(m_ysfFrame + 4U, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 14U, m_callsign.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 14U, m_m17cs.c_str(), YSF_CALLSIGN_LENGTH);
::memcpy(m_ysfFrame + 24U, "ALL ", YSF_CALLSIGN_LENGTH);

::memcpy(m_ysfFrame + 35U, YSF_SYNC_BYTES, YSF_SYNC_LENGTH_BYTES);
Expand All @@ -541,10 +580,10 @@ int CM172YSF::run()
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, dch);
break;
case 1:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (unsigned char*)m_callsign.c_str());
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (unsigned char*)m_m17cs.c_str());
break;
case 2:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (unsigned char*)m_callsign.c_str());
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (unsigned char*)m_m17cs.c_str());
break;
case 5:
memset(dch, ' ', YSF_CALLSIGN_LENGTH/2);
Expand Down
4 changes: 3 additions & 1 deletion M172YSF/M172YSF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ class CM172YSF

private:
std::string m_callsign;
std::string m_m17Ref;
std::string m_ysfcs;
std::string m_m17cs;
std::string m_m17Ref;
CConf m_conf;
CYSFNetwork* m_ysfNetwork;
CM17Network* m_m17Network;
Expand Down
2 changes: 1 addition & 1 deletion M172YSF/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#if !defined(VERSION_H)
#define VERSION_H

const char* VERSION = "20180923";
const char* VERSION = "20221013";

#endif

0 comments on commit e31ea5a

Please sign in to comment.