GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merges master 399d164 - default tuner configurations issue #57

Browse Source
This commit is contained in:
denny
2016-02-27 08:58:47 -05:00
parent a807ff5c07
commit 62851351a4
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/settings/SettingsManager.java
View File

@@ -564,11 +564,6 @@ public class SettingsManager
ArrayList<TunerConfiguration> configs = getSettings()
.getTunerConfigurations( type );
if( configs.isEmpty() )
{
configs.add( addNewTunerConfiguration( type, "Default" ) );
}
return configs;
}

8
src/source/tuner/TunerManager.java
View File

@@ -547,16 +547,14 @@ public class TunerManager
}
}
}
else
{
config = configs.get( 0 );
}
//If we're still null at this point, create a default config
if( config == null )
{
String name = "Default-" + tuner.getUniqueID();
config = mSettingsManager.addNewTunerConfiguration(
tuner.getTunerType(), "Default" );
tuner.getTunerType(), name );
}
//Persist the config as the selected tuner configuration. The method

2
src/source/tuner/rtl/r820t/R820TTunerConfiguration.java
View File

@@ -34,7 +34,7 @@ public class R820TTunerConfiguration extends TunerConfiguration
private R820TLNAGain mLNAGain = R820TLNAGain.GAIN_222;
private R820TVGAGain mVGAGain = R820TVGAGain.GAIN_210;
private double mFrequencyCorrection = 0.0d;
private SampleRate mSampleRate = SampleRate.RATE_1_920MHZ;
private SampleRate mSampleRate = SampleRate.RATE_2_400MHZ;
/**
* Default constructor for JAXB