From fa09aeefdefe321de5de733a51d1bd5a8ea64a2d Mon Sep 17 00:00:00 2001 From: Aang23 Date: Mon, 22 Aug 2022 23:31:41 +0200 Subject: [PATCH] GOES-N Stuff --- pipelines/GOES.json | 45 ++++++++++++++++++++++++++++++++++++++++++++ src-testing/main.cpp | 33 +++++++++++++++++++------------- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/pipelines/GOES.json b/pipelines/GOES.json index cde4d9af2..c50022712 100644 --- a/pipelines/GOES.json +++ b/pipelines/GOES.json @@ -403,6 +403,7 @@ }, "frm": { "ccsds_simple_psk_decoder": { + "ccsds": false, "constellation": "bpsk", "cadu_size": 4096, "nrzm": false, @@ -413,5 +414,49 @@ }, "products": {} } + }, + "goesn_sounder": { + "name": "GOES-N Sounder SD", + "live": true, + "live_cfg": [ + [ + 1, + 0 + ], + [ + 2, + 0 + ] + ], + "frequencies": [ + [ + "CDA", + 1693e6 + ] + ], + "samplerate": 1e6, + "work": { + "baseband": {}, + "soft": { + "psk_demod": { + "constellation": "bpsk", + "symbolrate": 40e3, + "rrc_alpha": 0.5, + "pll_bw": 0.02 + } + }, + "frm": { + "ccsds_simple_psk_decoder": { + "ccsds": false, + "constellation": "bpsk", + "cadu_size": 4000, + "nrzm": true, + "derandomize": false, + "rs_i": 0, + "asm": "0xfb444e1e" + } + }, + "products": {} + } } } \ No newline at end of file diff --git a/src-testing/main.cpp b/src-testing/main.cpp index 89b2026fb..e67578b51 100644 --- a/src-testing/main.cpp +++ b/src-testing/main.cpp @@ -60,18 +60,25 @@ int main(int argc, char *argv[]) { uint8_t marker = (mdl_packets[i] >> 24) & 0b11111; - printf("VCID %d\n", marker); - // logger->critical(marker); + // printf("VCID %d\n", marker); + // logger->critical(marker); - // 4 & 7 = 0xb48b6f - - if (marker == 16) + // 4 & 7 = PCM 0xb48b6f + // 8 = + // 11 = + // 13 = + // 14 = + // 16 = + // 19 = + // 2 + // 25 + if (marker == 25) { - if ((mdl_packets[i] >> 24) & 0b1 == 1) - { - printf("SIZE %d\n", (int)test_v.size()); - test_v.clear(); - } + // if ((mdl_packets[i] >> 24) & 0b1 == 1) + ////// { + // printf("SIZE %d\n", (int)test_v.size()); + // test_v.clear(); + // } uint8_t buf[4]; buf[0] = (mdl_packets[i] >> 24) & 0xFF; @@ -79,9 +86,9 @@ int main(int argc, char *argv[]) buf[1] = (mdl_packets[i] >> 16) & 0xFF; buf[2] = (mdl_packets[i] >> 8) & 0xFF; buf[3] = (mdl_packets[i] >> 0) & 0xFF; - test_v.push_back(buf[1]); - test_v.push_back(buf[2]); - test_v.push_back(buf[3]); + // test_v.push_back(buf[1]); + // test_v.push_back(buf[2]); + // test_v.push_back(buf[3]); output_frm.write((char *)&buf[1], 3); } }