IQ amplitude phase correction

CMakeLists.txt

@@ -22,6 +22,7 @@
 # Project setup
 ########################################################################
 cmake_minimum_required(VERSION 2.6)
+set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 project(rtlsdr C)
 
 #select the release build type by default to get optimization flags

configure.ac

@@ -46,7 +46,7 @@ AC_CHECK_LIB(m, sqrt, [LIBS="$LIBS -lm"])
 dnl libmath (for rtl_power)
 AC_CHECK_LIB(m, atan2, [LIBS="$LIBS -lm"])
 
-dnl librealtime (for rtl_test)
+dnl librealtime (for rtl_test, rtl_fm)
 AC_CHECK_LIB(rt, clock_gettime, [LIBS="$LIBS -lrt"])
 
 # The following test is taken from WebKit's webkit.m4

include/rtl-sdr.h

@@ -144,6 +144,10 @@ RTLSDR_API int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
 
 RTLSDR_API int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq);
 
+RTLSDR_API int rtlsdr_set_if_freq(rtlsdr_dev_t *dev, uint32_t freq);
+
+RTLSDR_API int rtlsdr_set_if_bandwidth(rtlsdr_dev_t *dev, int bw);
+
 /*!
  * Get actual frequency the device is tuned to.
  *
@@ -322,6 +326,17 @@ RTLSDR_API int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on);
  */
 RTLSDR_API int rtlsdr_get_offset_tuning(rtlsdr_dev_t *dev);
 
+/*!
+ * Enable or disable frequency dithering for r820t tuners.
+ * Must be performed before freq_set().
+ * Fails for other tuners.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param on 0 means disabled, 1 enabled
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_dithering(rtlsdr_dev_t *dev, int dither);
+
 /* streaming functions */
 
 RTLSDR_API int rtlsdr_reset_buffer(rtlsdr_dev_t *dev);

include/tuner_r82xx.h

@@ -32,7 +32,8 @@
 #define R82XX_CHECK_ADDR	0x00
 #define R82XX_CHECK_VAL		0x69
 
-#define R82XX_IF_FREQ		3570000
+#define R82XX_DEFAULT_IF_FREQ   6000000
+#define R82XX_DEFAULT_IF_BW     2000000
 
 #define REG_SHADOW_START	5
 #define NUM_REGS		30
@@ -82,8 +83,10 @@ struct r82xx_priv {
 	uint32_t			int_freq;
 	uint8_t				fil_cal_code;
 	uint8_t				input;
-	int				has_lock;
 	int				init_done;
+	int				disable_dither;
+	int				reg_cache;
+	int				reg_batch, reg_low, reg_high;
 
 	/* Store current mode */
 	uint32_t			delsys;
@@ -115,5 +118,9 @@ int r82xx_standby(struct r82xx_priv *priv);
 int r82xx_init(struct r82xx_priv *priv);
 int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq);
 int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain);
+int r82xx_set_nomod(struct r82xx_priv *priv);
+int r82xx_set_dither(struct r82xx_priv *priv, int dither);
+int r82xx_set_bw(struct r82xx_priv *priv, uint32_t bw);
+int r82xx_set_if_freq(struct r82xx_priv *priv, uint32_t freq);
 
 #endif

librtlsdr.pc.in

@@ -7,5 +7,6 @@ Name: RTL-SDR Library
 Description: C Utility Library
 Version: @VERSION@
 Cflags: -I${includedir}/ @RTLSDR_PC_CFLAGS@
-Libs: -L${libdir} -lrtlsdr -lusb-1.0
+Libs: -L${libdir} -lrtlsdr
 Libs.private: @RTLSDR_PC_LIBS@
+Requires: libusb-1.0

rtlsdr.conf

@@ -0,0 +1,2 @@
+# disable DVB drivers
+blacklist dvb_usb_rtl28xxu

src/CMakeLists.txt

@@ -28,11 +28,9 @@ add_library(rtlsdr_shared SHARED
     tuner_fc2580.c
     tuner_r82xx.c
 )
-
 target_link_libraries(rtlsdr_shared
     ${LIBUSB_LIBRARIES}
 )
-
 set_target_properties(rtlsdr_shared PROPERTIES DEFINE_SYMBOL "rtlsdr_EXPORTS")
 set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr)
 set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION})
@@ -46,25 +44,17 @@ add_library(rtlsdr_static STATIC
     tuner_fc2580.c
     tuner_r82xx.c
 )
+target_link_libraries(rtlsdr_static
+    ${LIBUSB_LIBRARIES}
+)
+set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
 
 add_library(convenience_static STATIC
     convenience/convenience.c
 )
-
-if(WIN32)
-add_library(libgetopt_static STATIC
-    getopt/getopt.c
-)
 target_link_libraries(convenience_static
     rtlsdr_shared
 )
-endif()
-
-target_link_libraries(rtlsdr_static
-    ${LIBUSB_LIBRARIES}
-)
-
-set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
 
 if(NOT WIN32)
 # Force same library filename for static and shared variants of the library
@@ -83,60 +73,57 @@ add_executable(rtl_adsb rtl_adsb.c)
 add_executable(rtl_power rtl_power.c)
 set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power)
 
-target_link_libraries(rtl_sdr rtlsdr_shared convenience_static
+target_link_libraries(rtl_sdr convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-target_link_libraries(rtl_tcp rtlsdr_shared convenience_static
+target_link_libraries(rtl_tcp convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-target_link_libraries(rtl_test rtlsdr_shared convenience_static
+target_link_libraries(rtl_test convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-target_link_libraries(rtl_fm rtlsdr_shared convenience_static
+target_link_libraries(rtl_fm convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static
+target_link_libraries(rtl_eeprom convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-target_link_libraries(rtl_adsb rtlsdr_shared convenience_static
+target_link_libraries(rtl_adsb convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-target_link_libraries(rtl_power rtlsdr_shared convenience_static
+target_link_libraries(rtl_power convenience_static rtlsdr_shared
     ${LIBUSB_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
 if(UNIX)
-target_link_libraries(rtl_fm m)
 target_link_libraries(rtl_adsb m)
 target_link_libraries(rtl_power m)
 if(APPLE)
     target_link_libraries(rtl_test m)
+    target_link_libraries(rtl_fm m)
 else()
     target_link_libraries(rtl_test m rt)
+    target_link_libraries(rtl_fm m rt)
 endif()
 endif()
 
 if(WIN32)
+add_library(libgetopt_static STATIC
+    getopt/getopt.c
+)
 target_link_libraries(rtl_sdr libgetopt_static)
 target_link_libraries(rtl_tcp ws2_32 libgetopt_static)
 target_link_libraries(rtl_test libgetopt_static)
 target_link_libraries(rtl_fm libgetopt_static)
 target_link_libraries(rtl_eeprom libgetopt_static)
 target_link_libraries(rtl_adsb libgetopt_static)
 target_link_libraries(rtl_power libgetopt_static)
-set_property(TARGET rtl_sdr APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
-set_property(TARGET rtl_tcp APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
-set_property(TARGET rtl_test APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
-set_property(TARGET rtl_fm APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
-set_property(TARGET rtl_eeprom APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
-set_property(TARGET rtl_adsb APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
-set_property(TARGET rtl_power APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
 endif()
 ########################################################################
 # Install built library files & utilities

src/convenience/convenience.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 by Kyle Keen <[email protected]>
+ * Copyright (C) 2013-2014 by Kyle Keen <[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
@@ -174,6 +174,8 @@ int verbose_direct_sampling(rtlsdr_dev_t *dev, int on)
 		fprintf(stderr, "Enabled direct sampling mode, input 1/I.\n");}
 	if (on == 2) {
 		fprintf(stderr, "Enabled direct sampling mode, input 2/Q.\n");}
+	if (on == 3) {
+		fprintf(stderr, "Enabled no-mod direct sampling mode.\n");}
 	return r;
 }
 
@@ -232,6 +234,34 @@ int verbose_ppm_set(rtlsdr_dev_t *dev, int ppm_error)
 	return r;
 }
 
+int verbose_ppm_eeprom(rtlsdr_dev_t *dev, int *ppm_error)
+{
+	#define start_char ' '
+	#define stop_char 'p'
+	int i, r, len, status = -1;
+	char vendor[256], product[256], serial[256];
+	r = rtlsdr_get_usb_strings(dev, vendor, product, serial);
+	if (r) {
+		return r;
+	}
+	len = strlen(serial);
+	if (len <= 3) {
+		return -1;}
+	if (serial[len-1] != stop_char) {
+		return -1;}
+	serial[len-1] = '\0';
+	for (i=len-3; i>=0; i--) {
+		if (serial[i] != start_char) {
+			continue;}
+		fprintf(stderr, "PPM calibration found in eeprom.\n");
+		status = 0;
+		*ppm_error = atoi(serial + i + 1);
+		break;
+	}
+	serial[len-1] = stop_char;
+	return status;
+}
+
 int verbose_reset_buffer(rtlsdr_dev_t *dev)
 {
 	int r;
@@ -245,16 +275,19 @@ int verbose_device_search(char *s)
 {
 	int i, device_count, device, offset;
 	char *s2;
-	char vendor[256], product[256], serial[256];
+	char vendor[256] = {0}, product[256] = {0}, serial[256] = {0};
 	device_count = rtlsdr_get_device_count();
 	if (!device_count) {
 		fprintf(stderr, "No supported devices found.\n");
 		return -1;
 	}
 	fprintf(stderr, "Found %d device(s):\n", device_count);
 	for (i = 0; i < device_count; i++) {
-		rtlsdr_get_device_usb_strings(i, vendor, product, serial);
-		fprintf(stderr, "  %d:  %s, %s, SN: %s\n", i, vendor, product, serial);
+		if (rtlsdr_get_device_usb_strings(i, vendor, product, serial) == 0) {
+			fprintf(stderr, "  %d:  %s, %s, SN: %s\n", i, vendor, product, serial);
+		} else {
+			fprintf(stderr, "  %d:  %s\n", i, "Failed to query data");
+		}
 	}
 	fprintf(stderr, "\n");
 	/* does string look like raw id number */

src/convenience/convenience.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 by Kyle Keen <[email protected]>
+ * Copyright (C) 2013-2014 by Kyle Keen <[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
@@ -122,6 +122,15 @@ int verbose_gain_set(rtlsdr_dev_t *dev, int gain);
 
 int verbose_ppm_set(rtlsdr_dev_t *dev, int ppm_error);
 
+/*!
+ * Attempts to extract a correction value from eeprom and store it to an int.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param ppm_error correction value in parts per million (ppm)
+ * \return 0 on success
+ */
+int verbose_ppm_eeprom(rtlsdr_dev_t *dev, int *ppm_error);
+
 /*!
  * Reset buffer
  *