g4klx/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM_HS.git synced 2026-01-20 07:20:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the configuration backward compatible with 1.5.2, change version to 1.6.1.

Browse source
This commit is contained in:
Jonathan Naylor 2023-04-26 16:12:12 +01:00
parent a12e7f6fce
commit 520f39148a
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SerialPort.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013,2015,2016,2018,2020,2021 by Jonathan Naylor G4KLX
* Copyright (C) 2013,2015,2016,2018,2020,2021,2023 by Jonathan Naylor G4KLX
* Copyright (C) 2016 by Colin Durbridge G4EML
* Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU
* Copyright (C) 2019 by Florian Wolters DF2ET
@ -239,7 +239,7 @@ void CSerialPort::getVersion()
uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
{
if (length < 23U)
if (length < 13U)
return 4U;
bool ysfLoDev = (data[0U] & 0x08U) == 0x08U;
@ -286,15 +286,24 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
uint8_t dmrDelay = data[7U];
#endif
m_cwIdTXLevel = data[5U]>>2;
m_cwIdTXLevel = data[5U] >> 2;
uint8_t dstarTXLevel = data[9U];
uint8_t dmrTXLevel = data[10U];
uint8_t ysfTXLevel = data[11U];
uint8_t p25TXLevel = data[12U];
uint8_t nxdnTXLevel = data[15U];
uint8_t pocsagTXLevel = data[17U];
uint8_t m17TXLevel = data[21U];
uint8_t nxdnTXLevel = 128U;
uint8_t pocsagTXLevel = 128U;
uint8_t m17TXLevel = 128U;
if (length >= 16U)
nxdnTXLevel = data[15U];
if (length >= 18U)
pocsagTXLevel = data[17U];
if (length >= 22U)
m17TXLevel = data[21U];
io.setDeviations(dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, m17TXLevel, pocsagTXLevel, ysfLoDev);

6
version.h
View file

@ -1,6 +1,6 @@
/*
* Copyright (C) 2017,2018,2019,2020 by Andy Uribe CA6JAU
* Copyright (C) 2020,2021 by Jonathan Naylor G4KLX
* Copyright (C) 2020,2021,2023 by Jonathan Naylor G4KLX
*
* 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
@ -25,8 +25,8 @@
#define VER_MAJOR "1"
#define VER_MINOR "6"
#define VER_REV "0"
#define VERSION_DATE "20210919"
#define VER_REV "1"
#define VERSION_DATE "20230426"
#if defined(ZUMSPOT_ADF7021)
#define BOARD_INFO "ZUMspot"