Merge branch 'master' into M17

This commit is contained in:
Jonathan Naylor 2020-11-09 14:40:12 +00:00
commit 43732fbf3c
47 changed files with 330 additions and 78 deletions

8
IO.cpp
View file

@ -1,8 +1,8 @@
/*
* Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
* Copyright (C) 2016,2017,2018,2019,2020 by Andy Uribe CA6JAU
* Copyright (C) 2017 by Danilo DB4PLE
*
* 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
@ -318,7 +318,7 @@ bool CIO::hasRXOverflow()
return m_rxBuffer.hasOverflowed();
}
#if defined(ZUMSPOT_ADF7021)
#if defined(ZUMSPOT_ADF7021) || defined(SKYBRIDGE_HS)
void CIO::checkBand(uint32_t frequency_rx, uint32_t frequency_tx) {
if (!(io.hasSingleADF7021())) {
// There are two ADF7021s on the board
@ -391,7 +391,7 @@ uint8_t CIO::setFreq(uint32_t frequency_rx, uint32_t frequency_tx, uint8_t rf_po
#endif
// Check if we have a single, dualband or duplex board
#if defined (ZUMSPOT_ADF7021)
#if defined(ZUMSPOT_ADF7021) || defined(SKYBRIDGE_HS)
if (checkZUMspot(frequency_rx, frequency_tx) > 0) {
return 4U;
}