Merge branch 'master' into boxcar_dstar_correlator

boxcar_dstar_correlator
Jonathan Naylor 2018-03-27 21:37:28 +01:00
commit 8a646f36d4
1 changed files with 1 additions and 6 deletions

View File

@ -76,12 +76,7 @@ const uint8_t MMDVM_DEBUG3 = 0xF3U;
const uint8_t MMDVM_DEBUG4 = 0xF4U;
const uint8_t MMDVM_DEBUG5 = 0xF5U;
#if defined(EXTERNAL_OSC)
#define DESCRIPTION "MMDVM 20180223 TCXO (D-Star/DMR/System Fusion/P25/NXDN/RSSI/CW Id)"
#else
#define DESCRIPTION "MMDVM 20180223 (D-Star/DMR/System Fusion/P25/NXDN/RSSI/CW Id)"
#endif
#define DESCRIPTION "MMDVM 20180327 (D-Star/DMR/System Fusion/P25/NXDN)"
#if defined(GITVERSION)
#define concat(a, b) a " GitID #" b ""