Merge branch 'master' into pocsag

This commit is contained in:
phl0 2018-06-14 19:34:16 +02:00
commit dbea23f171
No known key found for this signature in database
GPG Key ID: 48EA1E640798CA9A
1 changed files with 8 additions and 6 deletions

View File

@ -79,22 +79,24 @@ const uint8_t MMDVM_DEBUG4 = 0xF4U;
const uint8_t MMDVM_DEBUG5 = 0xF5U;
#if EXTERNAL_OSC == 12000000
#define TCXO "12.0000"
#define TCXO "12.0000 MHz"
#elif EXTERNAL_OSC == 12288000
#define TCXO "12.2880"
#define TCXO "12.2880 MHz"
#elif EXTERNAL_OSC == 14400000
#define TCXO "14.4000"
#define TCXO "14.4000 MHz"
#elif EXTERNAL_OSC == 19200000
#define TCXO "19.2000"
#define TCXO "19.2000 Mhz"
#else
#define TCXO "NO TCXO"
#endif
#define DESCRIPTION "MMDVM 20180327 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG)"
#if defined(GITVERSION)
#define concat(a, b, c) a " " b "MHz GitID #" c ""
#define concat(a, b, c) a " " b " GitID #" c ""
const char HARDWARE[] = concat(DESCRIPTION, TCXO, GITVERSION);
#else
#define concat(a, b, c, d) a " " b "MHz (Build: " c " " d ")"
#define concat(a, b, c, d) a " " b " (Build: " c " " d ")"
const char HARDWARE[] = concat(DESCRIPTION, TCXO, __TIME__, __DATE__);
#endif