VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-22 18:55:45 -04:00
Code Issues Projects Releases Wiki Activity

New preset design. Implement for BladeRF interim #3

Browse Source
This commit is contained in:
Edouard Griffiths 2015-09-30 19:03:50 +02:00
parent 9987c7db4f
commit 76cb615a18
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/samplesource/bladerf/bladerfgui.cpp
View File

@ -179,13 +179,13 @@ void BladerfGui::on_decim_valueChanged(int value)
void BladerfGui::on_fcPos_currentIndexChanged(int index) void BladerfGui::on_fcPos_currentIndexChanged(int index)
{ {
if (index == 0) { if (index == 0) {
m_settings.m_fcPos = BladerfInput::FC_POS_INFRA; m_settings.m_fcPos = BladeRFSettings::FC_POS_INFRA;
sendSettings(); sendSettings();
} else if (index == 1) { } else if (index == 1) {
m_settings.m_fcPos = BladerfInput::FC_POS_SUPRA; m_settings.m_fcPos = BladeRFSettings::FC_POS_SUPRA;
sendSettings(); sendSettings();
} else if (index == 2) { } else if (index == 2) {
m_settings.m_fcPos = BladerfInput::FC_POS_CENTER; m_settings.m_fcPos = BladeRFSettings::FC_POS_CENTER;
sendSettings(); sendSettings();
} }
} }

6
plugins/samplesource/bladerf/bladerfsettings.cpp
View File

@ -49,7 +49,7 @@ QByteArray BladeRFSettings::serialize() const
s.writeS32(3, m_vga1); s.writeS32(3, m_vga1);
s.writeS32(4, m_vga2); s.writeS32(4, m_vga2);
s.writeS32(5, m_bandwidth); s.writeS32(5, m_bandwidth);
s.writeS32(6, m_log2Decim); s.writeU32(6, m_log2Decim);
s.writeS32(7, (int) m_fcPos); s.writeS32(7, (int) m_fcPos);
s.writeBool(8, m_xb200); s.writeBool(8, m_xb200);
s.writeS32(9, (int) m_xb200Path); s.writeS32(9, (int) m_xb200Path);
@ -70,7 +70,7 @@ bool BladeRFSettings::deserialize(const QByteArray& data)
return false; return false;
} }
if (d.getVersion() == SampleSourceSerializer::getSerializerVersion()) if (d.getVersion() == 1)
{ {
int intval; int intval;
@ -79,7 +79,7 @@ bool BladeRFSettings::deserialize(const QByteArray& data)
d.readS32(3, &m_vga1); d.readS32(3, &m_vga1);
d.readS32(4, &m_vga2); d.readS32(4, &m_vga2);
d.readS32(5, &m_bandwidth); d.readS32(5, &m_bandwidth);
d.readS32(6, &m_log2Decim); d.readU32(6, &m_log2Decim);
d.readS32(7, &intval); d.readS32(7, &intval);
m_fcPos = (fcPos_t) intval; m_fcPos = (fcPos_t) intval;
d.readBool(8, &m_xb200); d.readBool(8, &m_xb200);

2
plugins/samplesource/bladerf/bladerfsettings.h
View File

@ -17,6 +17,8 @@
#ifndef _BLADERF_BLADERFSETTINGS_H_ #ifndef _BLADERF_BLADERFSETTINGS_H_
#define _BLADERF_BLADERFSETTINGS_H_ #define _BLADERF_BLADERFSETTINGS_H_
#include <libbladeRF.h>
struct BladeRFSettings { struct BladeRFSettings {
typedef enum { typedef enum {
FC_POS_INFRA = 0, FC_POS_INFRA = 0,