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

Merge branch 'M17_AX25_FM' into I2C

Browse Source
This commit is contained in:
Jonathan Naylor
2020-12-26 12:13:24 +00:00
parent a9980556a1 9d85b6451c
commit fbe1b65b48
6 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
M17Control.cpp
View File

@@ -269,7 +269,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
data[1U] = 0x00U;
// Generate the sync
CSync::addM17HeaderSync(data + 2U);
CSync::addM17LinkSetupSync(data + 2U);
unsigned char setup[M17_LICH_LENGTH_BYTES];
m_rfLICH.getLinkSetup(setup);
@@ -332,7 +332,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
rfData[1U] = 0x00U;
// Generate the sync
CSync::addM17DataSync(rfData + 2U);
CSync::addM17StreamSync(rfData + 2U);
unsigned char lich[M17_LICH_FRAGMENT_LENGTH_BYTES];
m_netLICH.getFragment(lich, m_rfLICHn);
@@ -541,7 +541,7 @@ void CM17Control::writeNetwork()
start[1U] = 0x00U;
// Generate the sync
CSync::addM17HeaderSync(start + 2U);
CSync::addM17LinkSetupSync(start + 2U);
unsigned char setup[M17_LICH_LENGTH_BYTES];
m_netLICH.getLinkSetup(setup);
@@ -563,7 +563,7 @@ void CM17Control::writeNetwork()
data[1U] = 0x00U;
// Generate the sync
CSync::addM17DataSync(data + 2U);
CSync::addM17StreamSync(data + 2U);
m_netFrames++;

5
M17Defines.h
View File

@@ -24,8 +24,9 @@ const unsigned int M17_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate
const unsigned int M17_FRAME_LENGTH_BITS = 384U;
const unsigned int M17_FRAME_LENGTH_BYTES = M17_FRAME_LENGTH_BITS / 8U;
const unsigned char M17_HEADER_SYNC_BYTES[] = {0x5DU, 0xDDU};
const unsigned char M17_DATA_SYNC_BYTES[] = {0xDDU, 0xDDU};
const unsigned char M17_LINK_SETUP_SYNC_BYTES[] = {0x55U, 0xF7U};
const unsigned char M17_STREAM_SYNC_BYTES[] = {0xFFU, 0x5DU};
const unsigned char M17_PACKET_SYNC_BYTES[] = {0x75U, 0xFFU};
const unsigned int M17_SYNC_LENGTH_BITS = 16U;
const unsigned int M17_SYNC_LENGTH_BYTES = M17_SYNC_LENGTH_BITS / 8U;

15
Sync.cpp
View File

@@ -85,16 +85,23 @@ void CSync::addNXDNSync(unsigned char* data)
data[i] = (data[i] & ~NXDN_FSW_BYTES_MASK[i]) | NXDN_FSW_BYTES[i];
}
void CSync::addM17HeaderSync(unsigned char* data)
void CSync::addM17LinkSetupSync(unsigned char* data)
{
assert(data != NULL);
::memcpy(data, M17_HEADER_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
::memcpy(data, M17_LINK_SETUP_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
}
void CSync::addM17DataSync(unsigned char* data)
void CSync::addM17StreamSync(unsigned char* data)
{
assert(data != NULL);
::memcpy(data, M17_DATA_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
::memcpy(data, M17_STREAM_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
}
void CSync::addM17PacketSync(unsigned char* data)
{
assert(data != NULL);
::memcpy(data, M17_PACKET_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
}

5
Sync.h
View File

@@ -33,8 +33,9 @@ public:
static void addNXDNSync(unsigned char* data);
static void addM17HeaderSync(unsigned char* data);
static void addM17DataSync(unsigned char* data);
static void addM17LinkSetupSync(unsigned char* data);
static void addM17StreamSync(unsigned char* data);
static void addM17PacketSync(unsigned char* data);
private:
};

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H)
#define VERSION_H
const char* VERSION = "20201215";
const char* VERSION = "20201226";
#endif

2
linux/DMRIDUpdate.sh
View File

@@ -53,7 +53,7 @@ DMRIDPATH=/path/to/DMR/ID/file
DMRIDFILE=${DMRIDPATH}/DMRIds.dat
# DMR IDs now served by RadioID.net
DATABASEURL='https://ham-digital.org/status/users.csv'
DATABASEURL='https://database.radioid.net/static/user.csv'
#
# How many DMR ID files do you want backed up (0 = do not keep backups)