MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle the new firmware version better.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-09-16 19:33:33 +01:00
parent 86aa8bdf98
commit 5fa3b8f524
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
YSFControl.cpp
View File

@@ -219,7 +219,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
} }
unsigned char cm = m_lastFICH.getCM(); unsigned char cm = m_lastFICH.getCM();
if (cm == YSF_CM_GROUP) if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
m_rfDest = (unsigned char*)"ALL "; m_rfDest = (unsigned char*)"ALL ";
else else
m_rfDest = m_rfPayload.getDest(); m_rfDest = m_rfPayload.getDest();
@@ -402,7 +402,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
} }
unsigned char cm = m_lastFICH.getCM(); unsigned char cm = m_lastFICH.getCM();
if (cm == YSF_CM_GROUP) if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
m_rfDest = (unsigned char*)"ALL "; m_rfDest = (unsigned char*)"ALL ";
else else
m_rfDest = m_rfPayload.getDest(); m_rfDest = m_rfPayload.getDest();
@@ -601,7 +601,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
return false; return false;
unsigned char cm = m_lastFICH.getCM(); unsigned char cm = m_lastFICH.getCM();
if (cm == YSF_CM_GROUP) if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
m_rfDest = (unsigned char*)"ALL "; m_rfDest = (unsigned char*)"ALL ";
else else
m_rfDest = m_rfPayload.getDest(); m_rfDest = m_rfPayload.getDest();
@@ -649,7 +649,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_rfSource, YSF_CALLSIGN_LENGTH); memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_rfSource, YSF_CALLSIGN_LENGTH);
memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH); memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);
if (cm == YSF_CM_GROUP) if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
memset(csd1 + 0U, '*', YSF_CALLSIGN_LENGTH); memset(csd1 + 0U, '*', YSF_CALLSIGN_LENGTH);
else else
memcpy(csd1 + 0U, m_rfDest, YSF_CALLSIGN_LENGTH); memcpy(csd1 + 0U, m_rfDest, YSF_CALLSIGN_LENGTH);
@@ -741,7 +741,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
} }
unsigned char cm = m_lastFICH.getCM(); unsigned char cm = m_lastFICH.getCM();
if (cm == YSF_CM_GROUP) if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
m_rfDest = (unsigned char*)"ALL "; m_rfDest = (unsigned char*)"ALL ";
else else
m_rfDest = m_rfPayload.getDest(); m_rfDest = m_rfPayload.getDest();

5
YSFDefines.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,8 @@ const unsigned char YSF_DT_DATA_FR_MODE = 0x01U;
const unsigned char YSF_DT_VD_MODE2 = 0x02U; const unsigned char YSF_DT_VD_MODE2 = 0x02U;
const unsigned char YSF_DT_VOICE_FR_MODE = 0x03U; const unsigned char YSF_DT_VOICE_FR_MODE = 0x03U;
const unsigned char YSF_CM_GROUP = 0x00U; const unsigned char YSF_CM_GROUP1 = 0x00U;
const unsigned char YSF_CM_GROUP2 = 0x01U;
const unsigned char YSF_CM_INDIVIDUAL = 0x03U; const unsigned char YSF_CM_INDIVIDUAL = 0x03U;
const unsigned char YSF_MR_NOT_BUSY = 0x01U; const unsigned char YSF_MR_NOT_BUSY = 0x01U;