From 468e97759b209b68506560bb90bdee215c9d509f Mon Sep 17 00:00:00 2001 From: dernasherbrezon Date: Fri, 28 Jun 2024 21:25:15 +0100 Subject: [PATCH] migrate to standard decoders --- .../r2cloud/satellite/decoder/Decoders.java | 5 -- src/main/resources/satellites.json | 78 +++++++++++++++++-- 2 files changed, 72 insertions(+), 11 deletions(-) diff --git a/src/main/java/ru/r2cloud/satellite/decoder/Decoders.java b/src/main/java/ru/r2cloud/satellite/decoder/Decoders.java index 33ed2517..7e9cfe08 100644 --- a/src/main/java/ru/r2cloud/satellite/decoder/Decoders.java +++ b/src/main/java/ru/r2cloud/satellite/decoder/Decoders.java @@ -6,7 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ru.r2cloud.jradio.RawBeacon; import ru.r2cloud.jradio.ax25.Ax25Beacon; import ru.r2cloud.jradio.ccsds.TransferFrame; import ru.r2cloud.jradio.fox.Fox1BBeacon; @@ -67,10 +66,6 @@ public Decoders(PredictOreKit predict, Configuration props, ProcessFactory proce index("51439", "51439-0", new GaspacsDecoder(predict, props)); index("53385", "53385-0", new GeoscanDecoder(predict, props)); index("53108", "53108-0", new CcsdsDecoder(predict, props, TransferFrame.class)); - index("53807", "53807-0", new Cc11xxDecoder(predict, props, RawBeacon.class, "10010011000010110101000111011110", 512)); - index("51509", "51509-0", new Cc11xxDecoder(predict, props, RawBeacon.class, "10010011000010110101000111011110", 512)); - index("56180", "56180-0", new Cc11xxDecoder(predict, props, RawBeacon.class, "10010011000010110101000111011110", 512)); - index("59588", "59588-0", new Cc11xxDecoder(predict, props, RawBeacon.class, "10010011000010110101000111011110", 512)); index("56993", "56993-0", new Mrc100Decoder(predict, props, Mrc100Beacon.class)); index("56211", "56211-1", new InspireSat7SpinoDecoder(predict, props)); index("57167", "57167-0", new StratosatTk1Decoder(predict, props)); diff --git a/src/main/resources/satellites.json b/src/main/resources/satellites.json index 344ce762..cf0c3141 100644 --- a/src/main/resources/satellites.json +++ b/src/main/resources/satellites.json @@ -1,4 +1,66 @@ [ + { + "id": "R2CLOUD385", + "name": "MONITOR-2 (RS39S)", + "noradId": "57184", + "enabled": false, + "transmitters": [ + { + "modulation": "AFSK", + "framing": "AX25", + "beaconClass": "ru.r2cloud.jradio.ax25.Ax25Beacon", + "frequency": 435815000, + "bandwidth": 20000, + "baudRates": [ + 1200 + ], + "deviation": 600, + "afCarrier": 1700, + "status": "ENABLED" + } + ] + }, + { + "id": "R2CLOUD384", + "name": "SATURN", + "noradId": "57174", + "enabled": false, + "transmitters": [ + { + "modulation": "AFSK", + "framing": "AX25", + "beaconClass": "ru.r2cloud.jradio.ax25.Ax25Beacon", + "frequency": 435790000, + "bandwidth": 20000, + "baudRates": [ + 1200 + ], + "deviation": 600, + "afCarrier": 1700, + "status": "ENABLED" + } + ] + }, + { + "id": "R2CLOUD383", + "name": "ACS3", + "noradId": "59588", + "enabled": false, + "transmitters": [ + { + "modulation": "GFSK", + "framing": "CC11XX", + "beaconClass": "ru.r2cloud.jradio.RawBeacon", + "frequency": 401500000, + "bandwidth": 10000, + "baudRates": [ + 2400 + ], + "status": "ENABLED", + "syncword": "10010011000010110101000111011110" + } + ] + }, { "id": "R2CLOUD382", "name": "GAGARINEC", @@ -2265,6 +2327,8 @@ "frequency": 436915000, "bandwidth": 20000, "baudRates": [ + 1200, + 2400, 9600 ], "status": "ENABLED" @@ -2279,14 +2343,15 @@ "transmitters": [ { "modulation": "GFSK", - "framing": "CUSTOM", + "framing": "CC11XX", "beaconClass": "ru.r2cloud.jradio.RawBeacon", "frequency": 401100000, "bandwidth": 10000, "baudRates": [ 2400 ], - "status": "ENABLED" + "status": "ENABLED", + "syncword": "10010011000010110101000111011110" } ] }, @@ -2857,7 +2922,7 @@ "transmitters": [ { "modulation": "GFSK", - "framing": "CUSTOM", + "framing": "CC11XX", "beaconClass": "ru.r2cloud.jradio.RawBeacon", "frequency": 437500000, "bandwidth": 20000, @@ -2865,7 +2930,8 @@ 2400, 9600 ], - "status": "ENABLED" + "status": "ENABLED", + "syncword": "10010011000010110101000111011110" } ] }, @@ -3828,7 +3894,7 @@ { "id": "R2CLOUD122", "name": "MCUBED-2", - "noradId": "39469", + "noradId": "39472", "enabled": true, "transmitters": [ { @@ -4910,7 +4976,7 @@ "framing": "U482C", "beaconClass": "ru.r2cloud.jradio.gomx1.Gomx1Beacon", "frequency": 437250000, - "bandwidth": 15000, + "bandwidth": 20000, "baudRates": [ 4800 ],