Partial check-in of R820T tuner controller. Tuning is not yet functional.

This commit is contained in:
dennis.sheirer
2014-05-16 20:13:41 +00:00
parent 39a6868519
commit f70fca55b7
8 changed files with 947 additions and 545 deletions

View File

@@ -22,14 +22,18 @@ import javax.xml.bind.annotation.XmlAttribute;
import source.tuner.TunerConfiguration;
import source.tuner.TunerType;
import source.tuner.rtl.RTL2832TunerController.SampleRate;
import source.tuner.rtl.r820t.R820TTunerController.R820TGain;
import source.tuner.rtl.r820t.R820TTunerController.R820TLNAGain;
import source.tuner.rtl.r820t.R820TTunerController.R820TMixerGain;
import source.tuner.rtl.r820t.R820TTunerController.R820TVGAGain;
public class R820TTunerConfiguration extends TunerConfiguration
{
// private R820TGain mMasterGain = R820TGain.AUTOMATIC;
// private R820TMixerGain mMixerGain = R820TMixerGain.AUTOMATIC;
// private R820TLNAGain mLNAGain = R820TLNAGain.AUTOMATIC;
// private R820TEnhanceGain mEnhanceGain = R820TEnhanceGain.AUTOMATIC;
private double mFrequencyCorrection = -12.0d;
private R820TGain mMasterGain = R820TGain.GAIN_36;
private R820TMixerGain mMixerGain = R820TMixerGain.GAIN_15;
private R820TLNAGain mLNAGain = R820TLNAGain.GAIN_21;
private R820TVGAGain mVGAGain = R820TVGAGain.GAIN_210;
private double mFrequencyCorrection = 0.0d;
private SampleRate mSampleRate = SampleRate.RATE_1_200MHZ;
/**
@@ -48,53 +52,53 @@ public class R820TTunerConfiguration extends TunerConfiguration
@Override
public TunerType getTunerType()
{
return TunerType.ELONICS_E4000;
return TunerType.RAFAELMICRO_R820T;
}
// @XmlAttribute( name = "master_gain" )
// public R820TGain getMasterGain()
// {
// return mMasterGain;
// }
//
// public void setMasterGain( R820TGain gain )
// {
// mMasterGain = gain;
// }
//
// @XmlAttribute( name = "mixer_gain" )
// public R820TMixerGain getMixerGain()
// {
// return mMixerGain;
// }
//
// public void setMixerGain( R820TMixerGain mixerGain )
// {
// mMixerGain = mixerGain;
// }
//
// @XmlAttribute( name = "lna_gain" )
// public R820TLNAGain getLNAGain()
// {
// return mLNAGain;
// }
//
// public void setLNAGain( R820TLNAGain lnaGain )
// {
// mLNAGain = lnaGain;
// }
//
// @XmlAttribute( name = "enhance_gain" )
// public R820TEnhanceGain getEnhanceGain()
// {
// return mEnhanceGain;
// }
//
// public void setEnhanceGain( R820TEnhanceGain enhanceGain )
// {
// mEnhanceGain = enhanceGain;
// }
//
@XmlAttribute( name = "master_gain" )
public R820TGain getMasterGain()
{
return mMasterGain;
}
public void setMasterGain( R820TGain gain )
{
mMasterGain = gain;
}
@XmlAttribute( name = "mixer_gain" )
public R820TMixerGain getMixerGain()
{
return mMixerGain;
}
public void setMixerGain( R820TMixerGain mixerGain )
{
mMixerGain = mixerGain;
}
@XmlAttribute( name = "lna_gain" )
public R820TLNAGain getLNAGain()
{
return mLNAGain;
}
public void setLNAGain( R820TLNAGain lnaGain )
{
mLNAGain = lnaGain;
}
@XmlAttribute( name = "vga_gain" )
public R820TVGAGain getVGAGain()
{
return mVGAGain;
}
public void setVGAGain( R820TVGAGain vgaGain )
{
mVGAGain = vgaGain;
}
@XmlAttribute( name = "frequency_correction" )
public double getFrequencyCorrection()
{