Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

This commit is contained in:
Florian (DF2ET) 2018-06-14 19:30:52 +02:00 committed by GitHub
parent b5a56487b1 3515b16222
commit 5fe665a6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SerialPort.cpp
View File

@ -77,13 +77,13 @@ const uint8_t MMDVM_DEBUG4 = 0xF4U;
const uint8_t MMDVM_DEBUG5 = 0xF5U; const uint8_t MMDVM_DEBUG5 = 0xF5U;
#if EXTERNAL_OSC == 12000000 #if EXTERNAL_OSC == 12000000
#define TCXO "12.0000" #define TCXO "12.0000 MHz"
#elif EXTERNAL_OSC == 12288000 #elif EXTERNAL_OSC == 12288000
#define TCXO "12.2880" #define TCXO "12.2880 MHz"
#elif EXTERNAL_OSC == 14400000 #elif EXTERNAL_OSC == 14400000
#define TCXO "14.4000" #define TCXO "14.4000 MHz"
#elif EXTERNAL_OSC == 19200000 #elif EXTERNAL_OSC == 19200000
#define TCXO "19.2000" #define TCXO "19.2000 Mhz"
#else #else
#define TCXO "NO TCXO" #define TCXO "NO TCXO"
#endif #endif
@ -91,10 +91,10 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define DESCRIPTION "MMDVM 20180327 (D-Star/DMR/System Fusion/P25/NXDN)" #define DESCRIPTION "MMDVM 20180327 (D-Star/DMR/System Fusion/P25/NXDN)"
#if defined(GITVERSION) #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); const char HARDWARE[] = concat(DESCRIPTION, TCXO, GITVERSION);
#else #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__); const char HARDWARE[] = concat(DESCRIPTION, TCXO, __TIME__, __DATE__);
#endif #endif