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

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2025-03-03 14:27:42 +00:00
parent 99b0723e43 351c1199fb
commit dcee575722
4 changed files with 65 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DStarControl.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2015-2019,2023 by Jonathan Naylor G4KLX
* Copyright (C) 2015-2019,2023,2025 by Jonathan Naylor G4KLX
*
* 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
@@ -103,27 +103,6 @@ private:
unsigned int m_bitErrsAccum;
unsigned int m_bitsCount;
bool m_enabled;
unsigned char* m_rfVoiceSyncData;
unsigned int m_rfVoiceSyncDataLen;
unsigned char* m_netVoiceSyncData;
unsigned int m_netVoiceSyncDataLen;
bool m_rfNextFrameIsFastData;
bool m_netNextFrameIsFastData;
unsigned int m_rfSkipDTMFBlankingFrames;
unsigned int m_netSkipDTMFBlankingFrames;
unsigned int maybeFixupVoiceFrame(
unsigned char* data,
unsigned int len,
unsigned int offset,
const char* log_prefix,
unsigned char n,
bool blank_dtmf,
unsigned char* voice_sync_data,
unsigned int& voice_sync_data_len,
bool& next_frame_is_fast_data,
unsigned int& skip_dtmf_blanking_frames
);
void writeNetwork();
@@ -165,4 +144,3 @@ private:
#endif
#endif