Merge pull request #23 from jj1bdx/jj1bdx-calibrate

Add airspyhf_calibrate for reading/writing calibration value

tools/src/CMakeLists.txt

@@ -42,6 +42,9 @@ install(TARGETS airspyhf_rx RUNTIME DESTINATION ${INSTALL_DEFAULT_BINDIR})
 add_executable(airspyhf_gpio airspyhf_gpio.c)
 install(TARGETS airspyhf_gpio RUNTIME DESTINATION ${INSTALL_DEFAULT_BINDIR})
 
+add_executable(airspyhf_calibrate airspyhf_calibrate.c)
+install(TARGETS airspyhf_calibrate RUNTIME DESTINATION ${INSTALL_DEFAULT_BINDIR})
+
 if(NOT libairspyhf_SOURCE_DIR)
 include_directories(${LIBAIRSPYHF_INCLUDE_DIR})
 LIST(APPEND TOOLS_LINK_LIBS ${LIBAIRSPYHF_LIBRARIES})
@@ -59,3 +62,4 @@ target_link_libraries(airspyhf_lib_version ${TOOLS_LINK_LIBS})
 target_link_libraries(airspyhf_info ${TOOLS_LINK_LIBS})
 target_link_libraries(airspyhf_rx ${TOOLS_LINK_LIBS})
 target_link_libraries(airspyhf_gpio ${TOOLS_LINK_LIBS})
+target_link_libraries(airspyhf_calibrate ${TOOLS_LINK_LIBS})

tools/src/airspyhf_calibrate.c

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2012 Jared Boone <[email protected]>
+ * Copyright 2013 Michael Ossmann <[email protected]>
+ * Copyright 2013/2014 Benjamin Vernoux <[email protected]>
+ * Copyright 2018 Andrea Montefusco IW0HDV <[email protected]>
+ * Copyright 2020 Kenji Rikitake JJ1BDX <[email protected]>
+ *
+ * This file is part of AirSpyHF+ (based on HackRF project).
+ *
+ * Compile with:
+ *
+ * gcc -Wall airspyhf_calibrate.c -lairspyhf -o airspyhf_calibrate -lm
+ *
+ * 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, 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <airspyhf.h>
+
+/*
+ * print the receiver calibration data
+ */
+void print_receiver_data (struct airspyhf_device* pd)
+{
+	if (pd) {
+		airspyhf_read_partid_serialno_t read_partid_serialno;
+		int32_t ppb;
+
+		if (airspyhf_board_partid_serialno_read(pd, &read_partid_serialno) == AIRSPYHF_SUCCESS) {
+			printf("S/N: 0x%08X%08X\n",
+					read_partid_serialno.serial_no[0],
+					read_partid_serialno.serial_no[1]
+			);
+		} else {
+			fprintf(stderr, "airspyhf_board_partid_serialno_read() failed\n");
+		}
+
+		if (airspyhf_get_calibration(pd, &ppb) == AIRSPYHF_SUCCESS) {
+			printf("Calibration = %d\n", ppb);
+		} else {
+			fprintf(stderr, "airspyhf_get_calibration() failed\n");
+		}
+	}
+}
+
+static void usage(void)
+{
+	printf("Usage:\n");
+	printf("\t-s <serial number>: open receiver with specified 64-bit serial number (required).\n");
+	printf("\t-c <new ppb>: set receiver with specified new calibration value (optional, signed decimal).\n");
+}
+
+void write_new_calibration_value (struct airspyhf_device *pd, int32_t new_ppb)
+{
+	if (airspyhf_set_calibration(pd, new_ppb) == AIRSPYHF_SUCCESS) {
+		printf("New Calibration = %d\n", new_ppb);
+	} else {
+		fprintf(stderr, "airspyhf_set_calibration() failed\n");
+	}
+
+	if (airspyhf_flash_calibration(pd) == AIRSPYHF_SUCCESS) {
+		printf("Flash Calibration successfully done\n");
+	} else {
+		fprintf(stderr, "airspyhf_flash_calibration() failed\n");
+	}
+}
+
+int main(const int argc, char * const *argv)
+{
+	int opt;
+	unsigned serial_number = 0;
+	unsigned long long sn;
+	unsigned ndev;
+	unsigned set_calibration = 0;
+	int32_t new_ppb;
+
+	// scan command line options
+	while( (opt = getopt(argc, argv, "?hs:c:")) != EOF ) {
+
+		switch (opt) {
+		case 's':
+			if (sscanf(optarg, "0x%llx", &sn) == 1) {
+				serial_number = 1;
+			} else {
+				fprintf(stderr, "argument error: '-%c %s'\n", opt, optarg);
+				usage();
+				return EXIT_FAILURE;
+			}
+			break;
+
+		case 'c':
+			if (sscanf(optarg, "%d", &new_ppb) == 1) {
+				set_calibration = 1;
+			} else {
+				fprintf(stderr, "argument error: '-%c %s'\n", opt, optarg);
+				usage();
+				return EXIT_FAILURE;
+			}
+			break;
+
+		default:
+			fprintf(stderr, "unknown argument '-%c'\n", opt);
+
+		case 'h':
+		case '?':
+			usage();
+			return EXIT_FAILURE;
+		}
+	}
+
+	// scan all devices, return how many are attached
+	ndev = airspyhf_list_devices(0, 0);
+
+	if (ndev <= 0) {
+		fprintf (stderr, "No devices attached.\n");
+		return EXIT_FAILURE;
+	}
+
+	if (serial_number) {
+		struct airspyhf_device *dev;
+
+		if (airspyhf_open_sn(&dev, sn) == AIRSPYHF_SUCCESS) {
+			print_receiver_data (dev);
+			if (set_calibration) {
+				write_new_calibration_value(dev, new_ppb);
+			}
+			return EXIT_SUCCESS;
+		} else {
+			fprintf (stderr, "Unable to open device with S/N 0x%16llX\n", sn);
+			return EXIT_FAILURE;
+		}
+	} else {
+		usage();
+		return EXIT_FAILURE;
+	}
+}

tools/src/airspyhf_gpio.c

@@ -91,7 +91,7 @@ int main (const int argc, char **argv)
 			break;
 
 			case 's':
-				if (sscanf(optarg, "0x%Lx", &sn) == 1) {
+				if (sscanf(optarg, "0x%llx", &sn) == 1) {
 					sn_msb = (uint32_t)(sn >> 32);
 					sn_lsb = (uint32_t)(sn & 0xFFFFFFFF);
 					printf("Receiver serial number to be opened: 0x%08X%08X\n",
@@ -126,7 +126,7 @@ int main (const int argc, char **argv)
 
 	if(serial_number) {
 		if (airspyhf_open_sn(&dev, sn) != AIRSPYHF_SUCCESS) {
-			fprintf (stderr, "Unable to open device with S/N 0x%16LX\n", sn);
+			fprintf (stderr, "Unable to open device with S/N 0x%16llX\n", sn);
 			goto exit_error;
 		}
 	} else {

tools/src/airspyhf_info.c

@@ -105,7 +105,7 @@ int main(const int argc, char * const *argv)
 
 		switch (opt) {
 		case 's':
-			if (sscanf(optarg, "0x%Lx", &sn) == 1) {
+			if (sscanf(optarg, "0x%llx", &sn) == 1) {
 				sn_msb = (uint32_t)(sn >> 32);
 				sn_lsb = (uint32_t)(sn & 0xFFFFFFFF);
 				printf("Receiver serial number to be opened: 0x%08X%08X\n",
@@ -150,7 +150,7 @@ int main(const int argc, char * const *argv)
 			print_receiver_data (dev);
 			return EXIT_SUCCESS;
 		} else {
-			fprintf (stderr, "Unable to open device with S/N 0x%16LX\n", sn);
+			fprintf (stderr, "Unable to open device with S/N 0x%16llX\n", sn);
 			return EXIT_FAILURE;
 		}
 	} else {

tools/src/airspyhf_rx.c

@@ -748,9 +748,11 @@ int main(int argc, char** argv)
 		char buf [64];
 		float average_rate_now = average_rate * 1e-6f;
 
-		snprintf(buf, sizeof(buf),"%2.3f", average_rate_now);
-		//average_rate_now = 9.5f;
-		fprintf(stderr, "Streaming at %5s MS/s\n", buf);
+		if (verbose) {
+			snprintf(buf, sizeof(buf),"%2.3f", average_rate_now);
+			//average_rate_now = 9.5f;
+			fprintf(stderr, "Streaming at %5s MS/s\n", buf);
+		}
 		if ((limit_num_samples == true) && (bytes_to_xfer == 0))
 			do_exit = true;
 		else