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

Fix some bugs in MMDVMCal mode

Browse source
This commit is contained in:
Andy CA6JAU 2018-02-16 17:52:31 -03:00
parent 8b4be8df31
commit 64cad981fa
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ADF7021.cpp
View file

@ -907,6 +907,37 @@ void CIO::updateCal()
uint32_t ADF7021_REG2;
float divider;
// Check frequency band
if( (m_frequency_tx >= VHF1_MIN) && (m_frequency_tx < VHF1_MAX) ) {
ADF7021_REG1 = ADF7021_REG1_VHF1; // VHF1, external VCO
div2 = 1U;
}
else if( (m_frequency_tx >= VHF2_MIN) && (m_frequency_tx < VHF2_MAX) ) {
ADF7021_REG1 = ADF7021_REG1_VHF2; // VHF1, external VCO
div2 = 1U;
}
else if( (m_frequency_tx >= UHF1_MIN)&&(m_frequency_tx < UHF1_MAX) ) {
ADF7021_REG1 = ADF7021_REG1_UHF1; // UHF1, internal VCO
div2 = 1U;
}
else if( (m_frequency_tx >= UHF2_MIN)&&(m_frequency_tx < UHF2_MAX) ) {
ADF7021_REG1 = ADF7021_REG1_UHF2; // UHF2, internal VCO
div2 = 2U;
}
else {
ADF7021_REG1 = ADF7021_REG1_UHF1; // UHF1, internal VCO
div2 = 1U;
}
if(div2 == 1U)
f_div = 2U;
else
f_div = 1U;
// VCO/OSCILLATOR (REG1)
AD7021_control_word = ADF7021_REG1;
Send_AD7021_control();
ADF7021_REG2 = (uint32_t) 0b10 << 28; // invert data (and RC alpha = 0.5)
ADF7021_REG2 |= (uint32_t) (m_dmrDev / div2) << 19; // deviation
ADF7021_REG2 |= (uint32_t) 0b111 << 4; // modulation (RC 4FSK)
@ -937,7 +968,10 @@ void CIO::updateCal()
ADF7021_TX_REG0 |= (uint32_t) m_TX_N_divider << 19; // frequency;
ADF7021_TX_REG0 |= (uint32_t) m_TX_F_divider << 4; // frequency;
setTX();
if (m_tx)
setTX();
else
setRX();
}
uint32_t CIO::RXfreq()

3
CalDMR.cpp
View file

@ -132,6 +132,9 @@ uint8_t CCalDMR::write(const uint8_t* data, uint8_t length)
if (m_transmit && m_state == DMRCAL1K_IDLE && m_calState == STATE_DMRDMO1K)
m_state = DMRCAL1K_VH;
if (!m_transmit)
io.ifConf(STATE_DMR, true);
return 0U;
}