Merge branch 'master' into nxdn

2025-12-21 06:55:52 +08:00 · 2018-01-15 21:12:56 +00:00
parent 712cfc89c6 cae6bed370
commit 10b0d3c14c
8 changed files with 90 additions and 19 deletions
--- a/MMDVMHost.h
+++ b/MMDVMHost.h
@@ -63,6 +63,7 @@ private:
  unsigned int   m_p25NetModeHang;
  unsigned int   m_nxdnNetModeHang;
  CTimer         m_modeTimer;
+  CTimer         m_dmrBeaconTimer;
  CTimer         m_dmrTXTimer;
  CTimer         m_cwIdTimer;
  bool           m_duplex;