ham-ref/satdump
1
0
Fork 0
mirror of https://github.com/SatDump/SatDump synced 2026-08-13 17:47:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct HRPT telemetry type check

Browse source 
The lower-nibble check does not apply to HRPT; use a full-byte check for HRPT and the lower nibble for LRPT.
This commit is contained in:
Nathan Barnes 2025-10-31 11:17:07 -05:00
parent 5fcb9be9d9
commit b5c867956f
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/meteor_support/meteor/instruments/msumr/module_meteor_msumr_lrpt.cpp
View file

@ -163,7 +163,7 @@ namespace meteor
if (pkt.payload.size() >= 62)
{
parseMSUMRTelemetry(msu_mr_telemetry, msu_mr_telemetry_calib, msumr_ids.size() - 1, &pkt.payload[8]);
parseMSUMRTelemetry(msu_mr_telemetry, msu_mr_telemetry_calib, msumr_ids.size() - 1, &pkt.payload[8], LRPT);
// Convert calibration data
uint16_t words10_bits[12];

12
plugins/meteor_support/meteor/instruments/msumr/msumr_tlm.h
View file

@ -3,11 +3,17 @@
#include <cstdint>
#include "nlohmann/json.hpp"
enum DownlinkMode : int
{
LRPT,
HRPT
};
// This is most likely temporary to some extent until
// more of this is figured out for calibration.
// Translations from Russians are definitely very imperfect,
// and this will need to be more data-oriented later!
inline void parseMSUMRTelemetry(nlohmann::json &msu_mr_telemetry, nlohmann::json &msu_mr_telemetry_calib, int linecnt, uint8_t *msumr_frame)
inline void parseMSUMRTelemetry(nlohmann::json &msu_mr_telemetry, nlohmann::json &msu_mr_telemetry_calib, int linecnt, uint8_t *msumr_frame, DownlinkMode mode)
{
if ((msumr_frame[12] & 0xF) == 0b0000)
msu_mr_telemetry[linecnt]["msu_mr_set"] = "primary";
@ -19,7 +25,7 @@ inline void parseMSUMRTelemetry(nlohmann::json &msu_mr_telemetry, nlohmann::json
int mid = msumr_frame[12] >> 4;
msu_mr_telemetry[linecnt]["msu_mr_id"] = mid;
if ((msumr_frame[13] & 0x0F) == 0x0F) // Analog TLM
if ((mode == LRPT && (msumr_frame[13] & 0x0F) == 0x0F) || (mode == HRPT && msumr_frame[13] == 0b00001111)) // Analog TLM
{
const char *names[16 + 5] = {
"Detector Temperature Channel 5", //"AF temperature of the 5th channel",
@ -61,7 +67,7 @@ inline void parseMSUMRTelemetry(nlohmann::json &msu_mr_telemetry, nlohmann::json
for (int i = 14; i < 16 /*+ 5*/; i++)
msu_mr_telemetry[linecnt]["analog_tlm"][names[15 - i]] = ((uint8_t *)msumr_frame)[14 + i];
}
else if ((msumr_frame[13] & 0x0F) == 0x00) // Digital TLM
else if ((mode == LRPT && (msumr_frame[13] & 0x0F) == 0x00) || (mode == HRPT && msumr_frame[13] == 0b00000000)) // Digital TLM
{
uint8_t *ptr = &msumr_frame[14];

2
plugins/meteor_support/meteor/module_meteor_instruments.cpp
View file

@ -100,7 +100,7 @@ namespace meteor
}
msumr_ids.push_back(msumr_frame[12] >> 4);
parseMSUMRTelemetry(msu_mr_telemetry, msu_mr_telemetry_calib, msumr_timestamps.size() - 1, msumr_frame.data());
parseMSUMRTelemetry(msu_mr_telemetry, msu_mr_telemetry_calib, msumr_timestamps.size() - 1, msumr_frame.data(), HRPT);
}
// MTVZA Deframing