From 3231e9828b50ae7b14edea1123169d8a53041397 Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Tue, 5 Apr 2016 19:30:09 -0400
Subject: [PATCH] Resolves #64 Persist last tuned frequency to tuner
 configurations

Task-Url: http://github.com/DSheirer/sdrtrunk/issues/issue/64
---
 src/source/tuner/TunerModel.java                    |  1 +
 src/source/tuner/airspy/AirspyTunerController.java  | 13 ++++++++++++-
 .../tuner/configuration/TunerConfiguration.java     | 12 ++++++++++++
 .../configuration/TunerConfigurationModel.java      | 13 +++++++++++++
 src/source/tuner/fcd/proV1/FCD1TunerController.java |  9 +++++++++
 .../tuner/fcd/proplusV2/FCD2TunerController.java    | 10 ++++++++++
 src/source/tuner/hackrf/HackRFTunerController.java  |  9 +++++++++
 src/source/tuner/rtl/e4k/E4KTunerController.java    | 10 ++++++++++
 .../tuner/rtl/r820t/R820TTunerController.java       |  9 +++++++++
 9 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/src/source/tuner/TunerModel.java b/src/source/tuner/TunerModel.java
index 079d04a7..09a74804 100644
--- a/src/source/tuner/TunerModel.java
+++ b/src/source/tuner/TunerModel.java
@@ -179,6 +179,7 @@ public class TunerModel extends AbstractTableModel implements Listener<TunerEven
 						break;
 					case FREQUENCY:
 						fireTableCellUpdated( index, FREQUENCY );
+						mTunerConfigurationModel.tunerFrequencyChanged( event.getTuner() );
 						break;
 					case SAMPLE_RATE:
 						fireTableCellUpdated( index, SAMPLE_RATE );
diff --git a/src/source/tuner/airspy/AirspyTunerController.java b/src/source/tuner/airspy/AirspyTunerController.java
index aaf23295..558d0752 100644
--- a/src/source/tuner/airspy/AirspyTunerController.java
+++ b/src/source/tuner/airspy/AirspyTunerController.java
@@ -36,7 +36,7 @@ import dsp.filter.hilbert.HilbertTransform;
 
 /**
  * SDR Trunk 
- * Copyright (C) 2015 Dennis Sheirer
+ * Copyright (C) 2015-2016 Dennis Sheirer
  *    
  * Ported from libairspy at:
  * https://github.com/airspy/host/tree/master/libairspy
@@ -324,6 +324,8 @@ public class AirspyTunerController extends TunerController
 				//linearity and sensitivity modes will automatically override
 				//the custom values.
 				setGain( airspy.getGain() );
+				
+				setFrequencyCorrection( airspy.getFrequencyCorrection() );
 			}
 			catch( Exception e )
 			{
@@ -331,6 +333,15 @@ public class AirspyTunerController extends TunerController
 						+ "airspy config", e );
 			}
 			
+			try
+			{
+				setFrequency( airspy.getFrequency() );
+			}
+			catch( SourceException se )
+			{
+				//Do nothing, we couldn't set the frequency
+			}
+			
 		}
 		else
 		{
diff --git a/src/source/tuner/configuration/TunerConfiguration.java b/src/source/tuner/configuration/TunerConfiguration.java
index 040b829f..fc0501ef 100644
--- a/src/source/tuner/configuration/TunerConfiguration.java
+++ b/src/source/tuner/configuration/TunerConfiguration.java
@@ -31,6 +31,7 @@ public abstract class TunerConfiguration
 	protected String mName;
 	protected String mUniqueID;
 	protected boolean mAssigned;
+	protected long mFrequency;
 
 	/**
 	 * Default constructor to support JAXB
@@ -86,6 +87,17 @@ public abstract class TunerConfiguration
 		mAssigned = assigned;
 	}
 	
+	@XmlAttribute( name = "frequency" )
+	public long getFrequency()
+	{
+		return mFrequency;
+	}
+	
+	public void setFrequency( long frequency )
+	{
+		mFrequency = frequency;
+	}
+	
 	@XmlAttribute( name = "tuner_type" )
 	public abstract TunerType getTunerType();
 }
diff --git a/src/source/tuner/configuration/TunerConfigurationModel.java b/src/source/tuner/configuration/TunerConfigurationModel.java
index 717e1790..40b69708 100644
--- a/src/source/tuner/configuration/TunerConfigurationModel.java
+++ b/src/source/tuner/configuration/TunerConfigurationModel.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sample.Listener;
+import source.tuner.Tuner;
 import source.tuner.TunerType;
 import source.tuner.configuration.TunerConfigurationEvent.Event;
 
@@ -368,4 +369,16 @@ public class TunerConfigurationModel extends AbstractTableModel
 		
 		return null;
 	}
+
+	/**
+	 * Stores the latest tuned frequency for the tuner in the currently assigned configuration
+	 */
+	public void tunerFrequencyChanged( Tuner tuner )
+	{
+		TunerConfiguration assigned = getTunerConfiguration( tuner.getTunerType(), tuner.getUniqueID() );
+		
+		assigned.setFrequency( tuner.getTunerController().getFrequency() );
+		
+		broadcast( new TunerConfigurationEvent( assigned, Event.CHANGE ) );
+	}
 }
diff --git a/src/source/tuner/fcd/proV1/FCD1TunerController.java b/src/source/tuner/fcd/proV1/FCD1TunerController.java
index b897922a..9df0590e 100644
--- a/src/source/tuner/fcd/proV1/FCD1TunerController.java
+++ b/src/source/tuner/fcd/proV1/FCD1TunerController.java
@@ -144,6 +144,15 @@ public class FCD1TunerController extends FCDTunerController
 					+ "exception while applying tuner config - " + 
 					e.getLocalizedMessage() );
 		}
+		
+		try
+		{
+			setFrequency( config.getFrequency() );
+		}
+		catch( SourceException se )
+		{
+			//Do nothing, we couldn't set the frequency
+		}
 	}
 
 	/**
diff --git a/src/source/tuner/fcd/proplusV2/FCD2TunerController.java b/src/source/tuner/fcd/proplusV2/FCD2TunerController.java
index 7a27c286..ac781262 100644
--- a/src/source/tuner/fcd/proplusV2/FCD2TunerController.java
+++ b/src/source/tuner/fcd/proplusV2/FCD2TunerController.java
@@ -113,8 +113,18 @@ public class FCD2TunerController extends FCDTunerController
 			FCD2TunerConfiguration fcd2 = (FCD2TunerConfiguration)config;
 
 			setFrequencyCorrection( fcd2.getFrequencyCorrection() );
+			setFrequency( fcd2.getFrequency() );
 			setLNAGain( fcd2.getGainLNA() );
 			setMixerGain( fcd2.getGainMixer() );
+			
+			try
+			{
+				setFrequency( fcd2.getFrequency() );
+			}
+			catch( SourceException se )
+			{
+				//Do nothing, we couldn't set the frequency
+			}
 		}
     }
 	
diff --git a/src/source/tuner/hackrf/HackRFTunerController.java b/src/source/tuner/hackrf/HackRFTunerController.java
index 791736cb..ef47b4c4 100644
--- a/src/source/tuner/hackrf/HackRFTunerController.java
+++ b/src/source/tuner/hackrf/HackRFTunerController.java
@@ -372,6 +372,15 @@ public class HackRFTunerController extends TunerController
             	throw new SourceException( "Error while applying tuner "
             			+ "configuration", e );
             }
+			
+			try
+			{
+				setFrequency( hackRFConfig.getFrequency() );
+			}
+			catch( SourceException se )
+			{
+				//Do nothing, we couldn't set the frequency
+			}
 		}
 		else
 		{
diff --git a/src/source/tuner/rtl/e4k/E4KTunerController.java b/src/source/tuner/rtl/e4k/E4KTunerController.java
index a5f92bda..2a84405c 100644
--- a/src/source/tuner/rtl/e4k/E4KTunerController.java
+++ b/src/source/tuner/rtl/e4k/E4KTunerController.java
@@ -152,12 +152,22 @@ public class E4KTunerController extends RTL2832TunerController
 					E4KEnhanceGain enhanceGain = e4kConfig.getEnhanceGain();
 					setEnhanceGain( enhanceGain, true );
 				}
+				
+				try
+				{
+					setFrequency( e4kConfig.getFrequency() );
+				}
+				catch( SourceException se )
+				{
+					//Do nothing, we couldn't set the frequency
+				}
 			}
 			catch( UsbException e )
 			{
 				throw new SourceException( "E4KTunerController - usb error "
 						+ "while applying tuner config", e );
 			}
+			
 		}
 		else
 		{
diff --git a/src/source/tuner/rtl/r820t/R820TTunerController.java b/src/source/tuner/rtl/r820t/R820TTunerController.java
index 766c1091..4ce92492 100644
--- a/src/source/tuner/rtl/r820t/R820TTunerController.java
+++ b/src/source/tuner/rtl/r820t/R820TTunerController.java
@@ -126,6 +126,15 @@ public class R820TTunerController extends RTL2832TunerController
 					R820TVGAGain vgaGain = config.getVGAGain();
 					setVGAGain( vgaGain, true );
 				}
+				
+				try
+				{
+					setFrequency( config.getFrequency() );
+				}
+				catch( SourceException se )
+				{
+					//Do nothing, we couldn't set the frequency
+				}
 			}
 			catch( UsbException e )
 			{