Mirics is changing freq now

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -48,6 +48,9 @@ void error_translate (int exception_code, char * exceptionclass) {
 		case TSDR_SAMPLE_RATE_WRONG:
 			strcpy(exceptionclass, "martin/tempest/core/exceptions/TSDRSampleRateWrongException");
 			return;
+		case TSDR_CANNOT_OPEN_DEVICE:
+			strcpy(exceptionclass, "martin/tempest/core/exceptions/TSDRCannotOpenDeviceException");
+			return;
 		default:
 			strcpy(exceptionclass, "java/lang/Exception");
 			return;

JavaGUI/jni/include/TSDRCodes.h

@@ -7,6 +7,7 @@
 	#define TSDR_ALREADY_RUNNING (3)
 	#define TSDR_PLUGIN_PARAMETERS_WRONG (4)
 	#define TSDR_SAMPLE_RATE_WRONG (5)
+	#define TSDR_CANNOT_OPEN_DEVICE (6)
 	#define TSDR_NOT_IMPLEMENTED (404)
 
 #endif

JavaGUI/jni/include/TSDRLibrary.h

@@ -17,6 +17,7 @@
 		volatile int running;
 		volatile int nativerunning;
 		int frames_to_average;
+		uint32_t centfreq;
 	} typedef tsdr_lib_t;
 
 	typedef void(*tsdr_readasync_function)(float *buf, int width, int height, void *ctx);

JavaGUI/src/martin/tempest/Main.java

@@ -190,6 +190,11 @@ public void stateChanged(ChangeEvent arg0) {
 		frmTempestSdr.getContentPane().add(lblFrequency);
 
 		spFrequency = new JSpinner();
+		spFrequency.addChangeListener(new ChangeListener() {
+			public void stateChanged(ChangeEvent arg0) {
+				onCenterFreqChange();
+			}
+		});
 		spFrequency.setBounds(223, 470, 340, 22);
 		spFrequency.setModel(new SpinnerNumberModel(new Long(200000000), new Long(0), new Long(2147483647), new Long(1)));
 		frmTempestSdr.getContentPane().add(spFrequency);
@@ -224,6 +229,15 @@ public void run() {
 
 			src.setParams(textArgs.getText());
 
+			final Long newfreq = (Long) spFrequency.getValue();
+			if (newfreq != null && newfreq > 0)
+				try {
+					mSdrlib.setBaseFreq(newfreq);
+				} catch (TSDRException e) {
+					displayException(frmTempestSdr, e);
+					return;
+				}
+			
 			new Thread() {
 				public void run() {
 					try {
@@ -249,6 +263,18 @@ private void onResolutionChange() {
 			displayException(frmTempestSdr, e);
 		}
 	}
+	
+	private void onCenterFreqChange() {
+		final Long newfreq = (Long) spFrequency.getValue();
+		
+		if (newfreq == null || newfreq < 0) return;
+		
+		try {
+			mSdrlib.setBaseFreq(newfreq);
+		} catch (TSDRException e) {
+			displayException(frmTempestSdr, e);
+		}
+	}
 
 	@Override
 	public void onFrameReady(TSDRLibrary lib, BufferedImage frame) {

JavaGUI/src/martin/tempest/core/exceptions/TSDRCannotOpenDeviceException.java

@@ -0,0 +1,14 @@
+package martin.tempest.core.exceptions;
+
+public class TSDRCannotOpenDeviceException extends TSDRException {
+
+	private static final long serialVersionUID = -7807615914689137600L;
+
+	public TSDRCannotOpenDeviceException(final Exception e) {
+		super(e);
+	}
+	
+	public TSDRCannotOpenDeviceException(final String msg) {
+		super(msg);
+	}
+}

JavaGUI/src/martin/tempest/core/exceptions/TSDRVideoParamsException.java

@@ -2,7 +2,7 @@
 
 public class TSDRVideoParamsException extends TSDRException {
 
-	private static final long serialVersionUID = -7807615914689137600L;
+	private static final long serialVersionUID = -1477143402409561990L;
 
 	public TSDRVideoParamsException(final Exception e) {
 		super(e);

TSDRPlugin_Mirics/src/TSDRCodes.h

@@ -7,6 +7,7 @@
 	#define TSDR_ALREADY_RUNNING (3)
 	#define TSDR_PLUGIN_PARAMETERS_WRONG (4)
 	#define TSDR_SAMPLE_RATE_WRONG (5)
+	#define TSDR_CANNOT_OPEN_DEVICE (6)
 	#define TSDR_NOT_IMPLEMENTED (404)
 
 #endif

TSDRPlugin_Mirics/src/TSDRPlugin_Mirics.c

@@ -7,29 +7,34 @@
 #include <mir_sdr.h>
 
 #include <stdint.h>
+#include <stdlib.h>
+
+#define SAMPLE_RATE (8000000)
+
+volatile int working = 0;
+double freq = 200;
+double desiredfreq = 200;
 
 void tsdrplugin_getName(char * name) {
 	strcpy(name, "TSDR Mirics SDR Plugin");
 }
 
 uint32_t tsdrplugin_setsamplerate(uint32_t rate) {
-	printf("Mirics setsamplerate %d\n", rate);
-	return TSDR_NOT_IMPLEMENTED;
+	return SAMPLE_RATE;
 }
 
 uint32_t tsdrplugin_getsamplerate() {
-	printf("Mirics getsamplerate\n");
-	return TSDR_NOT_IMPLEMENTED;
+	return SAMPLE_RATE;
 }
 
 int tsdrplugin_setbasefreq(uint32_t freq) {
-	printf("Mirics setbasefreq %d\n", freq);
-	return TSDR_NOT_IMPLEMENTED;
+	desiredfreq = freq;
+	return TSDR_OK;
 }
 
 int tsdrplugin_stop(void) {
-	printf("Mirics stop\n");
-	return TSDR_NOT_IMPLEMENTED;
+	working = 0;
+	return TSDR_OK;
 }
 
 int tsdrplugin_setgain(float gain) {
@@ -38,16 +43,62 @@ int tsdrplugin_setgain(float gain) {
 }
 
 int tsdrplugin_setParams(const char * params) {
-	float ver;
-	int err;
-
-	err = mir_sdr_ApiVersion(&ver);
-	printf("MIRICS VERSION %.4f with err %d\n", ver, err);
-	printf("Mirics setParams %s\n", params);
-	return TSDR_NOT_IMPLEMENTED;
+	return TSDR_OK;
 }
 
 int tsdrplugin_readasync(tsdrplugin_readasync_function cb, void *ctx) {
-	printf("Mirics Readasync\n");
-	return TSDR_NOT_IMPLEMENTED;
+	working = 1;
+
+	int err, sps, grc, rfc, fsc, i;
+	unsigned int fs;
+	int newGr = 40;
+
+	freq = desiredfreq;
+	err = mir_sdr_Init(newGr, 8, freq / 1000000.0, mir_sdr_BW_8_000, mir_sdr_IF_Zero, &sps);
+	if (err != 0) {
+		mir_sdr_Uninit();
+		return TSDR_CANNOT_OPEN_DEVICE;
+	}
+
+	short * xi = (short *)malloc(sps * sizeof(short));
+	short * xq = (short *)malloc(sps * sizeof(short));
+
+	int outbufsize =  2 * sps;
+	float * outbuf = (float *) malloc(sizeof(float) * outbufsize);
+
+	while (working) {
+		err = mir_sdr_ReadPacket(xi, xq, &fs, &grc, &rfc, &fsc);
+		if (err != 0) break;
+
+		if (freq != desiredfreq) {
+			freq = desiredfreq;
+			err = mir_sdr_SetRf(freq, 1, 0);
+
+			if (err == mir_sdr_RfUpdateError) {
+				mir_sdr_Uninit();
+				err = mir_sdr_Init(newGr, 8, freq / 1000000.0, mir_sdr_BW_8_000, mir_sdr_IF_Zero, &sps);
+			}
+
+			if (err != 0) {
+				printf("FS error id %d trying to set freq to %.4f\n", err, freq);
+				break;
+			}
+		}
+
+
+		for (i = 0; i < outbufsize; i++) {
+			const short val = (i & 1) ? (xq[i >> 1]) : (xi[i >> 1]);
+			outbuf[i] = (val - 32767) / 32767.0;
+		}
+
+		cb(outbuf, outbufsize, ctx);
+	}
+
+	free(outbuf);
+	free(xi);
+	free(xq);
+
+	if (mir_sdr_Uninit() != 0) return TSDR_ERR_PLUGIN;
+
+	return (err == 0) ? TSDR_OK : TSDR_ERR_PLUGIN;
 }

TSDRPlugin_RawFile/src/TSDRCodes.h

@@ -7,6 +7,7 @@
 	#define TSDR_ALREADY_RUNNING (3)
 	#define TSDR_PLUGIN_PARAMETERS_WRONG (4)
 	#define TSDR_SAMPLE_RATE_WRONG (5)
+	#define TSDR_CANNOT_OPEN_DEVICE (6)
 	#define TSDR_NOT_IMPLEMENTED (404)
 
 #endif

TSDRPlugin_RawFile/src/TSDRPlugin_RawFile.c

@@ -65,7 +65,7 @@ int tsdrplugin_stop(void) {
 }
 
 int tsdrplugin_setgain(float gain) {
-	return TSDR_NOT_IMPLEMENTED;
+	return TSDR_OK;
 }
 
 char * strtoken = NULL;