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

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2025-04-24 14:42:22 +01:00
parent 7bd0134482 8e0705e2a9
commit dc0c6b146c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DStarControl.cpp
View File

@@ -382,6 +382,8 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rfSlowData.add(data + 1U); m_rfSlowData.add(data + 1U);
} }
#ifdef notdef
// Switch off D-Star fast data for RF
if (m_rfState == RPT_RF_STATE::AUDIO) { if (m_rfState == RPT_RF_STATE::AUDIO) {
unsigned char type = m_rfSlowData.getType(); unsigned char type = m_rfSlowData.getType();
@@ -390,6 +392,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rfState = RPT_RF_STATE::DATA; m_rfState = RPT_RF_STATE::DATA;
} }
} }
#endif
if (m_rfState == RPT_RF_STATE::DATA) { if (m_rfState == RPT_RF_STATE::DATA) {
if (m_rfN == 0U) if (m_rfN == 0U)
@@ -747,6 +750,8 @@ void CDStarControl::writeNetwork()
} else { } else {
m_netSlowData.add(data + 2U); m_netSlowData.add(data + 2U);
#ifdef notdef
// Switch off D-Star fast data for network traffic
if (m_netState == RPT_NET_STATE::AUDIO) { if (m_netState == RPT_NET_STATE::AUDIO) {
unsigned char type = m_netSlowData.getType(); unsigned char type = m_netSlowData.getType();
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) { if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) {
@@ -754,6 +759,7 @@ void CDStarControl::writeNetwork()
m_netState = RPT_NET_STATE::DATA; m_netState = RPT_NET_STATE::DATA;
} }
} }
#endif
} }
} }

2
Version.h
View File

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