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

Merge pull request #195 from shawnchain/master 

Fixed the concat macro error if no GITVERSION is defined, which is in…
This commit is contained in:
Florian (DF2ET) 2018-09-18 15:23:36 +02:00 committed by GitHub
parent 4d780389bf c0952d73d1
commit 6563ee2fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SerialPort.cpp
View File

@ -103,7 +103,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
const char HARDWARE[] = concat(HW_TYPE, DESCRIPTION, TCXO, GITVERSION); const char HARDWARE[] = concat(HW_TYPE, DESCRIPTION, TCXO, GITVERSION);
#else #else
#define concat(h, a, b, c, d) h " " a " " b " (Build: " c " " d ")" #define concat(h, a, b, c, d) h " " a " " b " (Build: " c " " d ")"
const char HARDWARE[] = concat(DESCRIPTION, TCXO, __TIME__, __DATE__); const char HARDWARE[] = concat(HW_TYPE, DESCRIPTION, TCXO, __TIME__, __DATE__);
#endif #endif
const uint8_t PROTOCOL_VERSION = 1U; const uint8_t PROTOCOL_VERSION = 1U;