diff --git a/SerialPort.cpp b/SerialPort.cpp index 8be1cb1..d41c67e 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -20,11 +20,7 @@ #include "Config.h" #include "Globals.h" - -#if defined(MADEBYMAKEFILE) -#include "GitVersion.h" -#endif - +#include "version.h" #include "SerialPort.h" const uint8_t MMDVM_FRAME_START = 0xE0U; @@ -70,20 +66,6 @@ const uint8_t MMDVM_DEBUG3 = 0xF3U; const uint8_t MMDVM_DEBUG4 = 0xF4U; const uint8_t MMDVM_DEBUG5 = 0xF5U; -#if defined(ADF7021_N_VER) -#define DESCRIPTION "ZUMspot ADF7021N v1.0.2 20171023 (DStar/DMR/YSF/P25)" -#else -#define DESCRIPTION "ZUMspot ADF7021 v1.0.2 20171023 (DStar/DMR/YSF/P25)" -#endif - -#if defined(GITVERSION) -#define concat(a, b) a " GitID #" b "" -const char HARDWARE[] = concat(DESCRIPTION, GITVERSION); -#else -#define concat(a, b, c) a " (Build: " b " " c ")" -const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__); -#endif - const uint8_t PROTOCOL_VERSION = 1U; CSerialPort::CSerialPort() : @@ -207,7 +189,7 @@ void CSerialPort::getVersion() uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) { - if (length < 13U) + if (length < 15U) return 4U; bool ysfLoDev = (data[0U] & 0x08U) == 0x08U; diff --git a/version.h b/version.h new file mode 100644 index 0000000..669f52b --- /dev/null +++ b/version.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2016, 2017 by Andy Uribe CA6JAU + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#if !defined(VERSION_H) +#define VERSION_H + +#include "Config.h" + +#define VER_MAJOR "1" +#define VER_MINOR "0" +#define VER_REV "3" +#define VERSION_DATE "20171226" + +#if defined(ZUMSPOT_ADF7021) +#define BOARD_INFO "ZUMspot" +#elif defined(MMDVM_HS_HAT_REV12) +#define BOARD_INFO "MMDVM_HS_Hat" +#else +#define BOARD_INFO "MMDVM_HS" +#endif + +#if defined(ENABLE_ADF7021) +#define RF_CHIP "ADF7021" +#endif + +#if defined(DUPLEX) +#define RF_DUAL "dual " +#else +#define RF_DUAL "" +#endif + +#define FW_VERSION "v" VER_MAJOR "." VER_MINOR "." VER_REV " " VERSION_DATE + +#define DESCRIPTION BOARD_INFO "-" FW_VERSION " " RF_DUAL RF_CHIP " FW by CA6JAU" + +#if defined(MADEBYMAKEFILE) +#include "GitVersion.h" +#endif + +#if defined(GITVERSION) +#define concat(a, b) a " GitID #" b "" +const char HARDWARE[] = concat(DESCRIPTION, GITVERSION); +#else +#define concat(a, b, c) a " (Build: " b " " c ")" +const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__); +#endif + +#endif +