Merge branch 'development' into ir

Change infrared wait time flag to -W to fix conflict with the
new development-branch -w flag for tuner bandwidth

Conflicts:
	src/rtl_tcp.c

Author: rxseger

.gitignore

@@ -39,3 +39,15 @@ CMakeCache.txt
 */CMakeFiles
 CMakeFiles
 *.cmake
+build
+
+**/*.o
+**/*.so*
+**/*.a
+src/rtl_adsb
+src/rtl_eeprom
+src/rtl_fm
+src/rtl_power
+src/rtl_test
+
+debianize/*.deb

circle.yml

@@ -0,0 +1 @@
+*.deb

debian/.gitignore

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../"
+
+G_REV=`git rev-parse --short=8 HEAD`
+DATE=`date +"%Y%m%d%H%M%S"`
+#VERSION="0.5.3-git+${DATE}.${G_REV}~$1"
+VERSION=`git describe | cut -dv -f2`
+#
+# librtlsdr0
+#
+
+rm -fr /tmp/librtlsdr0/
+mkdir -p /tmp/librtlsdr0/
+mkdir -p /tmp/librtlsdr0/usr/lib/x86_64-linux-gnu/
+mkdir -p /tmp/librtlsdr0/DEBIAN
+
+cat <<- EOF > /tmp/librtlsdr0/DEBIAN/control
+Package: librtlsdr0
+Source: rtl-sdr
+Version: ${VERSION}
+Architecture: amd64
+Maintainer: Lucas Teske <[email protected]>
+Pre-Depends: multiarch-support
+Depends: libc6 (>= 2.14), libusb-1.0-0 (>= 2:1.0.9)
+Section: libs
+Priority: extra
+Multi-Arch: same
+Homepage: http://sdr.osmocom.org/trac/wiki/rtl-sdr
+Description: Software defined radio receiver for Realtek RTL2832U (library)
+ rtl-sdr is a software defined radio (SDR) receiver software for certain
+ low-cost DVB-T/DAB(+) USB dongles based on the Realtek RTL2832U chip.
+ .
+ This package contains the shared library.
+EOF
+
+DEB_PKG="librtlsdr0_${VERSION}_amd64.deb"
+
+cp -rf ${REPO_DIR}/build/src/lib*so* /tmp/librtlsdr0/usr/lib/x86_64-linux-gnu/
+dpkg-deb -b /tmp/librtlsdr0/ ./${DEB_PKG}
+
+echo ${DEB_PKG}
+
+#
+# rtl-sdr
+#
+
+rm -fr /tmp/rtl-sdr/
+mkdir -p /tmp/rtl-sdr/
+mkdir -p /tmp/rtl-sdr/usr/bin/
+mkdir -p /tmp/rtl-sdr/DEBIAN
+
+cat <<- EOF > /tmp/rtl-sdr/DEBIAN/control
+Package: rtl-sdr
+Version: ${VERSION}
+Architecture: amd64
+Maintainer: Lucas Teske <[email protected]>
+Depends: librtlsdr0 (= ${VERSION}), libc6 (>= 2.15)
+Section: libs
+Priority: extra
+Homepage: http://sdr.osmocom.org/trac/wiki/rtl-sdr
+Description: Software defined radio receiver for Realtek RTL2832U (tools)
+ rtl-sdr is a software defined radio (SDR) receiver software for certain
+ low-cost DVB-T/DAB(+) USB dongles based on the Realtek RTL2832U chip.
+ .
+ This package contains a set of command line utilities:
+  * rtl_adsb: a simple ADS-B decoder for RTL2832 based DVB-T receivers
+  * rtl_eeprom: an EEPROM programming tool for RTL2832 based DVB-T receivers
+  * rtl_fm: a narrow band FM demodulator for RTL2832 based DVB-T receivers
+  * rtl_sdr: an I/Q recorder for RTL2832 based DVB-T receivers
+  * rtl_tcp: an I/Q spectrum server for RTL2832 based DVB-T receivers
+  * rtl_test: a benchmark tool for RTL2832 based DVB-T receivers
+
+
+EOF
+
+DEB_PKG="rtl-sdr_${VERSION}_amd64.deb"
+
+cp -rf ${REPO_DIR}/build/src/rtl_* /tmp/rtl-sdr/usr/bin/
+dpkg-deb -b /tmp/rtl-sdr/ ./${DEB_PKG}
+
+echo ${DEB_PKG}
+
+
+#
+# librtlsdr-dev
+#
+
+rm -fr /tmp/librtlsdr-dev/
+mkdir -p /tmp/librtlsdr-dev/
+mkdir -p /tmp/librtlsdr-dev/usr/include
+mkdir -p /tmp/librtlsdr-dev/usr/lib/x86_64-linux-gnu/pkgconfig
+mkdir -p /tmp/librtlsdr-dev/DEBIAN
+
+cat <<- EOF > /tmp/librtlsdr-dev/DEBIAN/control
+Package: librtlsdr-dev
+Source: rtl-sdr
+Version: ${VERSION}
+Architecture: amd64
+Maintainer: Lucas Teske <[email protected]>
+Pre-Depends: multiarch-support
+Depends: librtlsdr0 (= ${VERSION})
+Section: libdevel
+Priority: extra
+Homepage: http://sdr.osmocom.org/trac/wiki/rtl-sdr
+Description: Software defined radio receiver for Realtek RTL2832U (development files)
+ rtl-sdr is a software defined radio (SDR) receiver software for certain
+ low-cost DVB-T/DAB(+) USB dongles based on the Realtek RTL2832U chip.
+ .
+ This package contains development files.
+
+EOF
+
+DEB_PKG="librtlsdr-dev_${VERSION}_amd64.deb"
+
+cp -rf ${REPO_DIR}/include/*.h /tmp/librtlsdr-dev/usr/include
+dpkg-deb -b /tmp/librtlsdr-dev/ ./${DEB_PKG}
+
+echo ${DEB_PKG}

debian/debianize

@@ -26,6 +26,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <rtl-sdr_export.h>
+#include <rtl_tcp.h>
 
 typedef struct rtlsdr_dev rtlsdr_dev_t;
 
@@ -142,6 +143,13 @@ RTLSDR_API int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
 RTLSDR_API int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
 				  uint8_t offset, uint16_t len);
 
+/*!
+ * Set the frequency the device is tuned to.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param frequency in Hz
+ * \return 0 on error, frequency in Hz otherwise
+ */
 RTLSDR_API int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq);
 
 /*!
@@ -220,9 +228,14 @@ RTLSDR_API int rtlsdr_set_tuner_gain(rtlsdr_dev_t *dev, int gain);
  *
  * \param dev the device handle given by rtlsdr_open()
  * \param bw bandwidth in Hz. Zero means automatic BW selection.
+ * \param applied_bw is applied bandwidth in Hz, or 0 if unknown
+ * \param apply_bw: 1 to really apply configure the tuner chip; 0 for just returning applied_bw
  * \return 0 on success
  */
-RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw);
+RTLSDR_API int rtlsdr_set_and_get_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw, uint32_t *applied_bw, int apply_bw );
+
+RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw );
+
 
 /*!
  * Get actual gain the device is configured to.
@@ -232,6 +245,17 @@ RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw);
  */
 RTLSDR_API int rtlsdr_get_tuner_gain(rtlsdr_dev_t *dev);
 
+/*!
+ * Set LNA / Mixer / VGA Device Gain for R820T device is configured to.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param lna_gain in tenths of a dB, -30 means -3.0 dB.
+ * \param mixer_gain in tenths of a dB, -30 means -3.0 dB.
+ * \param vga_gain in tenths of a dB, -30 means -3.0 dB.
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_tuner_gain_ext(rtlsdr_dev_t *dev, int lna_gain, int mixer_gain, int vga_gain);
+
 /*!
  * Set the intermediate frequency gain for the device.
  *

include/rtl-sdr.h

@@ -0,0 +1,51 @@
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012-2013 by Steve Markgraf <[email protected]>
+ * Copyright (C) 2012 by Dimitri Stolnikov <[email protected]>
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RTL_TCP_H
+#define __RTL_TCP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * This enum defines the possible commands in rtl_tcp
+ */
+enum RTL_TCP_COMMANDS {
+    SET_FREQUENCY             = 0x01,
+    SET_SAMPLE_RATE           = 0x02,
+    SET_GAIN_MODE             = 0x03,
+    SET_GAIN                  = 0x04,
+    SET_FREQUENCY_CORRECTION  = 0x05,
+    SET_IF_STAGE              = 0x06,
+    SET_TEST_MODE             = 0x07,
+    SET_AGC_MODE              = 0x08,
+    SET_DIRECT_SAMPLING       = 0x09,
+    SET_OFFSET_TUNING         = 0x0A,
+    SET_RTL_CRYSTAL           = 0x0B,
+    SET_TUNER_CRYSTAL         = 0x0C,
+    SET_TUNER_GAIN_BY_INDEX   = 0x0D,
+    SET_TUNER_BANDWIDTH       = 0x0E
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif