VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 09:48:45 -05:00
Code Issues Projects Releases Wiki Activity

HackRF input: reformat and reorganize code of PR #824

Browse Source
This commit is contained in:
f4exb 2021-03-29 05:42:45 +02:00
parent 0b946d5dd0
commit 3fafd22af1
2 changed files with 105 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -331,6 +331,96 @@ void HackRFInput::setDeviceCenterFrequency(quint64 freq_hz)
}
}
void HackRFInput::setDevicePPMCorrection(qint32 loPPMTenths)
{
if (!m_dev) {
return;
}
hackrf_error rc = HACKRF_SUCCESS;
const uint32_t msnaRegBase = 26; // Multisynth NA config register base
const int32_t msnaFreq = 800000000; // Multisynth NA target frequency
int32_t xo = 25000000; //Crystal frequency
int32_t a; // Multisynth NA XTAL multiplier integer 32 * 25mhz = 800mhz
int32_t b; // Multisynth NA XTAL multiplier fractional numerator 0 to 1048575
int32_t c; // Multisynth NA XTAL multiplier fractional denominator 1048575 max resolution
int64_t rem;
int32_t p1, p2, p3; // raw register values
xo = xo - xo/1000000*loPPMTenths/10; //adjust crystal freq by ppm error
a = msnaFreq / xo; //multiplier integer
rem = msnaFreq % xo; // multiplier remainder
if (rem)
{ //fraction mode
b = ((rem * 10485750)/xo +5) /10; //multiplier fractional numerator with rounding
c = 1048575; //multiplier fractional divisor
rc = (hackrf_error) hackrf_si5351c_write(m_dev, 22, 128); // MSNA set fractional mode
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA set to fraction mode.";
}
else
{ //integer mode
b = 0;
c = 1;
rc = (hackrf_error) hackrf_si5351c_write(m_dev, 22, 0); // MSNA set integer mode
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA set to integer mode.";
}
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA rem" << rem;
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA xoppm" << loPPMTenths / 10.0f;
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA xo" << xo;
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA a" << a;
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA b" << b;
qDebug() << "HackRFInput::setDevicePPMCorrection: si5351c MSNA c" << c;
p1 = 128*a + (128 * b/c) - 512;
p2 = (128*b) % c;
p3 = c;
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev,msnaRegBase, (p3 >> 8) & 0xFF); // reg 26 MSNA_P3[15:8]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 1, p3 & 0xFF); // reg 27 MSNA_P3[7:0]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 2, (p1 >> 16) & 0x3); // reg28 bits 1:0 MSNA_P1[17:16]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 3, (p1 >> 8) & 0xFF); // reg 29 MSNA_P1[15:8]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 4, p1 & 0xFF); // reg 30 MSNA_P1[7:0]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 5, ((p3 & 0xF0000) >> 12) | ((p2 >> 16) & 0xF)); // bits 7:4 MSNA_P3[19:16], reg31 bits 3:0 MSNA_P2[19:16]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 6, (p2 >> 8) & 0xFF); // reg 32 MSNA_P2[15:8]
}
if (rc == HACKRF_SUCCESS) {
rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 7, p2 & 0xFF); // reg 33 MSNA_P2[7:0]
}
if (rc != HACKRF_SUCCESS)
{
qDebug("HackRFInput::applySettings: XTAL error adjust failed: %s", hackrf_error_name(rc));
}
else
{
qDebug() << "HackRFInput::applySettings: si5351c MSNA registers"
<< msnaRegBase << "<-" << ((p3 >> 8) & 0xFF)
<< (msnaRegBase + 1) << "<-" << (p3 & 0xFF)
<< (msnaRegBase + 2) << "<-" << ((p1 >> 16) & 0x3)
<< (msnaRegBase + 3) << "<-" << ((p1 >> 8) & 0xFF)
<< (msnaRegBase + 4) << "<-" << (p1 & 0xFF)
<< (msnaRegBase + 5) << "<-" << (((p3 & 0xF0000) >> 12) | ((p2 >> 16) & 0xF))
<< (msnaRegBase + 6) << "<-" << ((p2 >> 8) & 0xFF)
<< (msnaRegBase + 7) << "<-" << (p2 & 0xFF);
qDebug() << "HackRFInput::applySettings: XTAL error adjusted by" << (loPPMTenths / 10.0f) << "PPM.";
}
}
bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
{
// QMutexLocker mutexLocker(&m_mutex);
@ -409,70 +499,10 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
reverseAPIKeys.append("centerFrequency");
}
if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) {
reverseAPIKeys.append("LOppmTenths");
if (m_dev != 0)
if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force)
{
const uint32_t msnaRegBase = 26; // Multisynth NA config register base
const int32_t msnaFreq = 800000000; // Multisynth NA target frequency
int32_t xo = 25000000; //Crystal frequency
int32_t a; // Multisynth NA XTAL multiplier integer 32 * 25mhz = 800mhz
int32_t b; // Multisynth NA XTAL multiplier fractional numerator 0 to 1048575
int32_t c; // Multisynth NA XTAL multiplier fractional denominator 1048575 max resolution
int64_t rem;
int32_t p1, p2, p3; // raw register values
xo = xo-xo/1000000*settings.m_LOppmTenths/10; //adjust crystal freq by ppm error
a = msnaFreq/xo; //multiplier integer
rem = msnaFreq%xo; // multiplier remainder
if (rem){ //fraction mode
b = ((rem * 10485750)/xo +5) /10; //multiplier fractional numerator with rounding
c = 1048575; //multiplier fractional divisor
rc = (hackrf_error) hackrf_si5351c_write(m_dev, 22, 128); // MSNA set fractional mode
qDebug() << "HackRFInput::applySettings: si5351c MSNA set to fraction mode.";
} else { //integer mode
b = 0;
c = 1;
rc = (hackrf_error) hackrf_si5351c_write(m_dev, 22, 0); // MSNA set integer mode
qDebug() << "HackRFInput::applySettings: si5351c MSNA set to integer mode.";
}
qDebug() << "HackRFInput::applySettings: si5351c MSNA rem" << rem;
qDebug() << "HackRFInput::applySettings: si5351c MSNA xoppm" << settings.m_LOppmTenths;
qDebug() << "HackRFInput::applySettings: si5351c MSNA xo" << xo;
qDebug() << "HackRFInput::applySettings: si5351c MSNA a" << a;
qDebug() << "HackRFInput::applySettings: si5351c MSNA b" << b;
qDebug() << "HackRFInput::applySettings: si5351c MSNA c" << c;
p1 = 128*a + (128 * b/c) - 512;
p2 = (128*b) % c;
p3 = c;
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev,msnaRegBase, (p3 >> 8) & 0xFF); // reg 26 MSNA_P3[15:8]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 1, p3 & 0xFF); // reg 27 MSNA_P3[7:0]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 2, (p1 >> 16) & 0x3); // reg28 bits 1:0 MSNA_P1[17:16]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 3, (p1 >> 8) & 0xFF); // reg 29 MSNA_P1[15:8]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 4, p1 & 0xFF); // reg 30 MSNA_P1[7:0]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 5, ((p3 & 0xF0000) >> 12) | ((p2 >> 16) & 0xF)); // bits 7:4 MSNA_P3[19:16], reg31 bits 3:0 MSNA_P2[19:16]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 6, (p2 >> 8) & 0xFF); // reg 32 MSNA_P2[15:8]
if (rc==HACKRF_SUCCESS) rc = (hackrf_error) hackrf_si5351c_write(m_dev, msnaRegBase + 7, p2 & 0xFF); // reg 33 MSNA_P2[7:0]
if (rc != HACKRF_SUCCESS) {
qDebug("HackRFInput::applySettings: XTAL error adjust failed: %s", hackrf_error_name(rc));
} else {
qDebug() << "HackRFInput::applySettings: si5351c MSNA registers"
<< msnaRegBase << "<-" << ((p3 >> 8) & 0xFF)
<< (msnaRegBase + 1) << "<-" << (p3 & 0xFF)
<< (msnaRegBase + 2) << "<-" << ((p1 >> 16) & 0x3)
<< (msnaRegBase + 3) << "<-" << ((p1 >> 8) & 0xFF)
<< (msnaRegBase + 4) << "<-" << (p1 & 0xFF)
<< (msnaRegBase + 5) << "<-" << (((p3 & 0xF0000) >> 12) | ((p2 >> 16) & 0xF))
<< (msnaRegBase + 6) << "<-" << ((p2 >> 8) & 0xFF)
<< (msnaRegBase + 7) << "<-" << (p2 & 0xFF);
qDebug() << "HackRFInput::applySettings: XTAL error adjusted by" << (settings.m_LOppmTenths/10.0) << "PPM." << settings.m_LOppmTenths;
}
}
reverseAPIKeys.append("LOppmTenths");
setDevicePPMCorrection(settings.m_LOppmTenths);
}
if ((m_settings.m_fcPos != settings.m_fcPos) || force) {

1
plugins/samplesource/hackrfinput/hackrfinput.h
View File

@ -160,6 +160,7 @@ private:
void closeDevice();
bool applySettings(const HackRFInputSettings& settings, bool force);
void setDeviceCenterFrequency(quint64 freq);
void setDevicePPMCorrection(qint32 loPPMTenths);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const HackRFInputSettings& settings, bool force);
void webapiReverseSendStartStop(bool start);