Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2024-01-29 17:06:59 +00:00
12 changed files with 692 additions and 342 deletions

View File

@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016-2019,2023 by Jonathan Naylor G4KLX
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
*
* 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
@@ -71,6 +71,7 @@ private:
unsigned int m_rfFrames;
unsigned int m_rfBits;
unsigned int m_rfErrs;
// unsigned int m_rfUndecodableLC;
unsigned int m_netFrames;
unsigned int m_netLost;
unsigned int m_rfDataFrames;
@@ -78,6 +79,8 @@ private:
unsigned char m_lastDUID;
CP25Audio m_audio;
CP25Data m_rfData;
// CP25Data m_rfLastLDU1;
// CP25Data m_rfLastLDU2;
CP25Data m_netData;
CP25LowSpeedData m_rfLSD;
CP25LowSpeedData m_netLSD;