LX3JL/xlxd
1
0
Fork 0
mirror of https://github.com/LX3JL/xlxd.git synced 2026-03-19 03:24:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add configuration for first DG-ID

Browse source
This commit is contained in:
Stefano Lande 2022-09-07 12:17:42 +02:00
parent adec5c8d14
commit cfcc839770
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -2,3 +2,5 @@
src/xlxd
ambed/ambed
ambedtest/ambedtest
.DS_Store
.vscode/

6
src/cimrsprotocol.cpp
View file

@ -908,9 +908,9 @@ char CImrsProtocol::DgidToModule(uint8 uiDgid) const
{
char cModule = ' ';
if ( (uiDgid >= 10) && (uiDgid < (10+NB_OF_MODULES)) )
if ( (uiDgid >= FIRST_DG_ID) && (uiDgid < (FIRST_DG_ID+NB_OF_MODULES)) )
{
cModule = 'A' + (uiDgid-10);
cModule = 'A' + (uiDgid-FIRST_DG_ID);
}
return cModule;
@ -921,7 +921,7 @@ uint8 CImrsProtocol::ModuleToDgid(char cModule) const
if ( (cModule >= 'A') && (cModule < ('A'+NB_OF_MODULES)) )
{
uiDgid = 10 + (cModule - 'A');
uiDgid = FIRST_DG_ID + (cModule - 'A');
}
return uiDgid;
}

4
src/cysfprotocol.cpp
View file

@ -477,10 +477,10 @@ bool CYsfProtocol::IsValidDvHeaderPacket(const CIp &Ip, const CYSFFICH &Fich, co
rpt1.SetModule(YSF_MODULE_ID);
CCallsign rpt2 = m_ReflectorCallsign;
if ( (Fich.getSQ() >= 10) && (Fich.getSQ() < 10+NB_OF_MODULES) )
if ( (Fich.getSQ() >= FIRST_DG_ID) && (Fich.getSQ() < FIRST_DG_ID+NB_OF_MODULES) )
{
// set module based on DG-ID value
rpt2.SetModule( 'A' + (char)(Fich.getSQ() - 10) );
rpt2.SetModule( 'A' + (char)(Fich.getSQ() - FIRST_DG_ID) );
}
else
{

1
src/main.h
View file

@ -127,6 +127,7 @@
#define YSF_DEFAULT_NODE_RX_FREQ 437000000 // in Hz
#define YSF_AUTOLINK_ENABLE 0 // 1 = enable, 0 = disable auto-link
#define YSF_AUTOLINK_MODULE 'B' // module for client to auto-link to
#define FIRST_DG_ID 24
// G3 Terminal
#define G3_PRESENCE_PORT 12346 // UDP port