support fractional baud rates for satdump

Author: dernasherbrezon

src/main/java/ru/r2cloud/satellite/SdrServerTransmitterFilter.java

@@ -18,9 +18,6 @@ public boolean accept(Transmitter satellite) {
 		if (satellite.getFraming().equals(Framing.APT)) {
 			return false;
 		}
-		if (satellite.getFraming().equals(Framing.SATDUMP)) {
-			return false;
-		}
 		return true;
 	}
 

src/main/java/ru/r2cloud/satellite/reader/SpyServerReader.java

@@ -15,6 +15,7 @@
 
 import ru.r2cloud.model.DeviceConfiguration;
 import ru.r2cloud.model.DeviceConnectionStatus;
+import ru.r2cloud.model.Framing;
 import ru.r2cloud.model.IQData;
 import ru.r2cloud.model.ObservationRequest;
 import ru.r2cloud.model.Transmitter;
@@ -57,10 +58,6 @@ public IQData start() throws InterruptedException {
 	}
 
 	private IQData startInternally() throws InterruptedException {
-		Integer maxBaudRate = Collections.max(transmitter.getBaudRates());
-		if (maxBaudRate == null) {
-			return null;
-		}
 		client = new SpyClient(deviceConfiguraiton.getHost(), deviceConfiguraiton.getPort(), deviceConfiguraiton.getTimeout());
 		client.start();
 		SpyServerStatus status = client.getStatus();
@@ -69,15 +66,13 @@ private IQData startInternally() throws InterruptedException {
 			client.stop();
 			return null;
 		}
+		Long sampleRate = getSampleRate(client, req.getId(), transmitter);
+		if (sampleRate == null) {
+			return null;
+		}
 		File rawFile = new File(config.getTempDirectory(), req.getSatelliteId() + "-" + req.getId() + "." + status.getFormat().getExtension());
-		Long sampleRate = null;
 		Long endTimeMillis = null;
 		try (OutputStream os = new BufferedOutputStream(new FileOutputStream(rawFile))) {
-			sampleRate = Util.getSmallestGoodDeviceSampleRate(maxBaudRate, status.getSupportedSampleRates());
-			if (sampleRate == null) {
-				LOG.error("[{}] cannot find sample rate for: {}", req.getId(), maxBaudRate);
-				return null;
-			}
 
 			LOG.info("[{}] starting observation on {} with sample rate {} gain {}", req.getId(), req.getFrequency(), sampleRate, deviceConfiguraiton.getGain());
 
@@ -149,4 +144,27 @@ public void complete() {
 		latch.countDown();
 	}
 
+	private static Long getSampleRate(SpyClient client, String id, Transmitter transmitter) {
+		if (transmitter.getFraming() != null && transmitter.getFraming().equals(Framing.SATDUMP)) {
+			// assume sorted asc
+			for (Long cur : client.getStatus().getSupportedSampleRates()) {
+				if (cur >= transmitter.getBandwidth()) {
+					return cur;
+				}
+			}
+			return null;
+		}
+		Integer maxBaudRate = Collections.max(transmitter.getBaudRates());
+		if (maxBaudRate == null) {
+			LOG.error("[{}] no configured baud raters", id);
+			return null;
+		}
+		Long sampleRate = Util.getSmallestGoodDeviceSampleRate(maxBaudRate, client.getStatus().getSupportedSampleRates());
+		if (sampleRate == null) {
+			LOG.error("[{}] cannot find sample rate for: {}", id, maxBaudRate);
+			return null;
+		}
+		return sampleRate;
+	}
+
 }

src/test/java/ru/r2cloud/satellite/reader/SpyServerReaderTest.java

@@ -18,6 +18,7 @@
 import ru.r2cloud.TestConfiguration;
 import ru.r2cloud.model.DataFormat;
 import ru.r2cloud.model.DeviceConfiguration;
+import ru.r2cloud.model.Framing;
 import ru.r2cloud.model.IQData;
 import ru.r2cloud.model.ObservationRequest;
 import ru.r2cloud.model.Transmitter;
@@ -38,42 +39,30 @@ public class SpyServerReaderTest {
 
 	@Test
 	public void testDeviceNotConnected() throws Exception {
-		mock = new SpyServerMock(deviceConfiguration.getHost());
-		mock.start();
-
-		deviceConfiguration.setPort(mock.getPort());
+		mock.setDeviceInfo(null);
 		SpyServerReader reader = new SpyServerReader(config, createValidRequest(), deviceConfiguration, createValidTransmitter(), new ReentrantLock());
 		reader.complete();
 		assertNull(reader.start());
 	}
 
 	@Test
-	public void testSuccess() throws Exception {
-		mock = new SpyServerMock(deviceConfiguration.getHost());
-		mock.start();
-
-		mock.setDeviceInfo(createAirSpy());
-		mock.setSync(createValidSync());
-		mock.setData(createSample(), SpyClient.SPYSERVER_MSG_TYPE_INT16_IQ);
+	public void testSatdump() throws Exception {
+		ObservationRequest req = createValidRequest();
+		Transmitter transmitter = createValidTransmitter();
+		// some generic satdump-based satellite info
+		transmitter.setBandwidth(2_400_000L);
+		transmitter.setFraming(Framing.SATDUMP);
+		SpyServerReader reader = new SpyServerReader(config, req, deviceConfiguration, transmitter, new ReentrantLock());
+		IQData result = syncRead(reader);
+		assertNotNull(result);
+		assertNotNull(result.getIq());
+	}
 
-		deviceConfiguration.setPort(mock.getPort());
+	@Test
+	public void testSuccess() throws Exception {
 		ObservationRequest req = createValidRequest();
 		SpyServerReader reader = new SpyServerReader(config, req, deviceConfiguration, createValidTransmitter(), new ReentrantLock());
-		new Thread(new Runnable() {
-
-			@Override
-			public void run() {
-				try {
-					// make sure all config parameters are sent/read
-					mock.waitForDataSent();
-				} catch (InterruptedException e) {
-					Thread.currentThread().interrupt();
-					return;
-				}
-				reader.complete();
-			}
-		}).start();
-		IQData result = reader.start();
+		IQData result = syncRead(reader);
 		assertNotNull(result);
 		assertEquals(DataFormat.COMPLEX_SIGNED_SHORT, result.getDataFormat());
 		assertEquals(46875, result.getSampleRate());
@@ -84,10 +73,17 @@ public void run() {
 
 	@Before
 	public void start() throws Exception {
+		mock = new SpyServerMock("localhost");
+		mock.start();
+		mock.setDeviceInfo(createAirSpy());
+		mock.setSync(createValidSync());
+		mock.setData(createSample(), SpyClient.SPYSERVER_MSG_TYPE_INT16_IQ);
+
 		deviceConfiguration = new DeviceConfiguration();
 		deviceConfiguration.setHost("localhost");
 		deviceConfiguration.setTimeout(1000);
 		deviceConfiguration.setGain(10.0f);
+		deviceConfiguration.setPort(mock.getPort());
 
 		config = new TestConfiguration(tempFolder);
 		config.setProperty("server.tmp.directory", tempFolder.getRoot().getAbsolutePath());
@@ -138,6 +134,25 @@ public static SpyClientSync createValidSync() {
 		return result;
 	}
 
+	private IQData syncRead(SpyServerReader reader) throws InterruptedException {
+		new Thread(new Runnable() {
+
+			@Override
+			public void run() {
+				try {
+					// make sure all config parameters are sent/read
+					mock.waitForDataSent();
+				} catch (InterruptedException e) {
+					Thread.currentThread().interrupt();
+					return;
+				}
+				reader.complete();
+			}
+		}).start();
+		IQData result = reader.start();
+		return result;
+	}
+
 	@After
 	public void stop() {
 		if (mock != null) {