From 0ad710fea2aa4ba7edc763512a40a5262d051e2e Mon Sep 17 00:00:00 2001 From: "dennis.sheirer" Date: Mon, 20 Oct 2014 23:25:37 +0000 Subject: [PATCH] Updated HackRF controller to included GSG copyright notice. --- .../tuner/hackrf/HackRFInformationPanel.java | 18 ++++++ .../tuner/hackrf/HackRFTunerController.java | 57 ++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/src/source/tuner/hackrf/HackRFInformationPanel.java b/src/source/tuner/hackrf/HackRFInformationPanel.java index 4a7ad795..f3825577 100644 --- a/src/source/tuner/hackrf/HackRFInformationPanel.java +++ b/src/source/tuner/hackrf/HackRFInformationPanel.java @@ -1,5 +1,23 @@ package source.tuner.hackrf; +/******************************************************************************* + * SDR Trunk + * Copyright (C) 2014 Dennis Sheirer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see + ******************************************************************************/ + import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/source/tuner/hackrf/HackRFTunerController.java b/src/source/tuner/hackrf/HackRFTunerController.java index 5270e98f..741e4063 100644 --- a/src/source/tuner/hackrf/HackRFTunerController.java +++ b/src/source/tuner/hackrf/HackRFTunerController.java @@ -1,6 +1,59 @@ package source.tuner.hackrf; - +/******************************************************************************* + * SDR Trunk + * Copyright (C) 2014 Dennis Sheirer + * + * Ported from libhackrf at: + * https://github.com/mossmann/hackrf/tree/master/host/libhackrf + * + * Copyright (c) 2012, Jared Boone + * Copyright (c) 2013, Benjamin Vernoux + * copyright (c) 2013, Michael Ossmann + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of Great Scott Gadgets nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see + ******************************************************************************/ import java.nio.ByteBuffer; + import java.nio.ByteOrder; import java.util.ArrayList; import java.util.Arrays; @@ -32,6 +85,7 @@ import source.tuner.TunerConfiguration; import source.tuner.TunerController; import source.tuner.rtl.ByteSampleAdapter; + public class HackRFTunerController extends TunerController { private final static Logger mLog = @@ -291,6 +345,7 @@ public class HackRFTunerController extends TunerController { setSampleRate( hackRFConfig.getSampleRate() ); setFrequencyCorrection( hackRFConfig.getFrequencyCorrection() ); + setAmplifierEnabled( hackRFConfig.getAmplifierEnabled() ); setLNAGain( hackRFConfig.getLNAGain() ); setVGAGain( hackRFConfig.getVGAGain() ); setFrequency( getFrequency() );