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

HackRF - partial check-in of code. HackRF is commented out in the TunerManager, since it's not yet ready for use.

Browse Source
This commit is contained in:
dennis.sheirer
2014-09-30 16:40:37 +00:00
parent 550aed79d4
commit c5c3029392
21 changed files with 2145 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/settings/IntegerSetting.java
View File

@@ -1,30 +0,0 @@
package settings;
import javax.xml.bind.annotation.XmlAttribute;
public class IntegerSetting extends Setting
{
private int mValue;
public IntegerSetting()
{
}
public IntegerSetting( String name, int value )
{
super( name );
mValue = value;
}
@XmlAttribute
public int getValue()
{
return mValue;
}
public void setValue( int value )
{
mValue = value;
}
}

17
src/settings/Settings.java
View File

@@ -33,6 +33,7 @@ import source.tuner.TunerConfigurationAssignment;
import source.tuner.TunerType;
import source.tuner.fcd.proV1.FCD1TunerConfiguration;
import source.tuner.fcd.proplusV2.FCD2TunerConfiguration;
import source.tuner.hackrf.HackRFTunerConfiguration;
import source.tuner.rtl.e4k.E4KTunerConfiguration;
import source.tuner.rtl.r820t.R820TTunerConfiguration;
@@ -45,7 +46,7 @@ import source.tuner.rtl.r820t.R820TTunerConfiguration;
FCD1TunerConfiguration.class,
FCD2TunerConfiguration.class,
FileSetting.class,
IntegerSetting.class,
HackRFTunerConfiguration.class,
MapViewSetting.class,
MapIcon.class,
R820TTunerConfiguration.class,
@@ -179,20 +180,6 @@ public class Settings
return null;
}
public IntegerSetting getIntegerSetting( String name )
{
for( Setting setting: mSettings )
{
if( setting instanceof IntegerSetting &&
((IntegerSetting)setting).getName().contentEquals( name ) )
{
return (IntegerSetting)setting;
}
}
return null;
}
public ColorSetting getColorSetting( ColorSettingName name )
{
for( Setting setting: mSettings )

37
src/settings/SettingsManager.java
View File

@@ -52,6 +52,7 @@ import source.tuner.TunerConfigurationAssignment;
import source.tuner.TunerType;
import source.tuner.fcd.proV1.FCD1TunerConfiguration;
import source.tuner.fcd.proplusV2.FCD2TunerConfiguration;
import source.tuner.hackrf.HackRFTunerConfiguration;
import source.tuner.rtl.e4k.E4KTunerConfiguration;
import source.tuner.rtl.r820t.R820TTunerConfiguration;
@@ -147,33 +148,6 @@ public class SettingsManager
return mSettings.getSetting( name );
}
public IntegerSetting getIntegerSetting( String name, int defaultValue )
{
IntegerSetting setting = mSettings.getIntegerSetting( name );
if( setting == null )
{
setting = new IntegerSetting( name, defaultValue );
mSettings.addSetting( setting );
save();
}
return setting;
}
public void setIntegerSetting( String name, int value )
{
IntegerSetting setting = getIntegerSetting( name, value );
setting.setValue( value );
save();
broadcastSettingChange( setting );
}
/**
* Returns the current setting, or if the setting doesn't exist
* returns a newly created setting with the specified parameters
@@ -616,6 +590,15 @@ public class SettingsManager
save();
return configPlus;
case HACKRF:
HackRFTunerConfiguration hackConfig =
new HackRFTunerConfiguration( name );
getSettings().addTunerConfiguration( hackConfig );
save();
return hackConfig;
case RAFAELMICRO_R820T:
R820TTunerConfiguration r820TConfig =
new R820TTunerConfiguration( name );