tune default min/max frequencies for different devices

+ simplify loading device configurations

Author: dernasherbrezon

src/main/java/ru/r2cloud/util/Configuration.java

@@ -46,8 +46,8 @@ satellites.instrument.location=./src/main/resources/instruments.json
 satellits.validate.external=true
 
 rtlsdr.devices=0
-rtlsdr.device.0.minFrequency=100000000
-rtlsdr.device.0.maxFrequency=1700000000
+rtlsdr.device.0.minFrequency=24000000
+rtlsdr.device.0.maxFrequency=1766000000
 rtlsdr.device.0.index=0
 rtlsdr.device.0.ppm=0
 rtlsdr.device.0.gain=45
@@ -56,8 +56,8 @@ rtlsdr.device.0.biast=false
 plutosdr.devices=
 plutosdr.timeout=10000
 plutosdr.device.0.gain=45
-plutosdr.device.0.minFrequency=100000000
-plutosdr.device.0.maxFrequency=1700000000
+plutosdr.device.0.minFrequency=325000000
+plutosdr.device.0.maxFrequency=3800000000
 
 scheduler.data.retention.raw.count=10
 scheduler.data.retention.maxSizeBytes=1073741824

src/main/resources/config-dev.properties

@@ -45,8 +45,8 @@ satellites.instrument.location=./etc/instruments.json
 satellits.validate.external=true
 
 rtlsdr.devices=0
-rtlsdr.device.0.minFrequency=100000000
-rtlsdr.device.0.maxFrequency=1700000000
+rtlsdr.device.0.minFrequency=24000000
+rtlsdr.device.0.maxFrequency=1766000000
 rtlsdr.device.0.index=0
 rtlsdr.device.0.ppm=0
 rtlsdr.device.0.gain=45
@@ -55,8 +55,8 @@ rtlsdr.device.0.biast=false
 plutosdr.devices=
 plutosdr.timeout=10000
 plutosdr.device.0.gain=45
-plutosdr.device.0.minFrequency=100000000
-plutosdr.device.0.maxFrequency=1700000000
+plutosdr.device.0.minFrequency=325000000
+plutosdr.device.0.maxFrequency=3800000000
 
 scheduler.data.retention.raw.count=10
 scheduler.data.retention.maxSizeBytes=10737418240

src/main/resources/config-prod.properties

@@ -2,8 +2,8 @@
 	"id": "rtlsdr.0",
 	"name": "RTL-SDR 0",
 	"deviceType": "RTLSDR",
-	"minimumFrequency": 100000000,
-	"maximumFrequency": 1700000000,
+	"minimumFrequency": 24000000,
+	"maximumFrequency": 1766000000,
 	"gain": 45,
 	"rtlDeviceId": "0",
 	"biast": false,

src/test/resources/deviceConfig/expectedLoad.json

@@ -36,8 +36,8 @@
 			"status": "CONNECTED",
 			"model": "Analog Devices PlutoSDR Rev.B (Z7010-AD9363A)",
 			"connection": "PlutoSDR",
-			"minFrequency": 100000000,
-			"maxFrequency": 1700000000,
+			"minFrequency": 325000000,
+			"maxFrequency": 3800000000,
 			"rotator": {
 				"status": "DISABLED"
 			}
@@ -47,8 +47,8 @@
 			"status": "CONNECTED",
 			"model": "Realtek, RTL2838UHIDIR, SN: 00000100",
 			"connection": "RTL-SDR 0",
-			"minFrequency": 100000000,
-			"maxFrequency": 1700000000,
+			"minFrequency": 24000000,
+			"maxFrequency": 1766000000,
 			"rotator": {
 				"status": "DISABLED"
 			}

src/test/resources/expectedOverview.json

@@ -19,7 +19,7 @@
 	"numberOfDecodedPackets": 1,
 	"device": {
 		"id": "loraatblec.0",
-		"name": "LoRa - 7b:7a:24:3c:ed:50",
+		"name": "LoRa - 7B:7A:24:3C:ED:50",
 		"deviceType": "LORAATBLEC",
 		"minimumFrequency": 433000000,
 		"maximumFrequency": 480000000,

src/test/resources/r2cloudclienttest/1559982858904-59114-0.json

@@ -22,8 +22,8 @@
 		"id": "rtlsdr.0",
 		"name": "RTL-SDR 0",
 		"deviceType": "RTLSDR",
-		"minimumFrequency": 100000000,
-		"maximumFrequency": 1700000000,
+		"minimumFrequency": 24000000,
+		"maximumFrequency": 1766000000,
 		"gain": 45,
 		"rtlDeviceId": "0",
 		"biast": false,

src/test/resources/r2cloudclienttest/40069-1553411549943-request.json

@@ -20,8 +20,8 @@
 		"id": "rtlsdr.0",
 		"name": "RTL-SDR 0",
 		"deviceType": "RTLSDR",
-		"minimumFrequency": 100000000,
-		"maximumFrequency": 1700000000,
+		"minimumFrequency": 24000000,
+		"maximumFrequency": 1766000000,
 		"gain": 45,
 		"rtlDeviceId": "0",
 		"biast": false,