blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 11:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

RDA Status Data support for Build < 18.0

Browse source
This commit is contained in:
Dan Paulat 2022-02-12 18:23:07 -06:00
parent a2b1955995
commit 0df6defe01
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
wxdata/source/scwx/wsr88d/rda/rda_status_data.cpp
View file

@ -274,10 +274,7 @@ bool RdaStatusData::Parse(std::istream& is)
is.read(reinterpret_cast<char*>(&p->performanceCheckStatus_), 2); // 26 is.read(reinterpret_cast<char*>(&p->performanceCheckStatus_), 2); // 26
is.read(reinterpret_cast<char*>(&p->alarmCodes_), is.read(reinterpret_cast<char*>(&p->alarmCodes_),
p->alarmCodes_.size() * 2); // 27-40 p->alarmCodes_.size() * 2); // 27-40
is.read(reinterpret_cast<char*>(&p->signalProcessingOptions_), 2); // 41 bytesRead += 80;
is.seekg(36, std::ios_base::cur); // 42-59
is.read(reinterpret_cast<char*>(&p->statusVersion_), 2); // 42
bytesRead += 120;
p->rdaStatus_ = ntohs(p->rdaStatus_); p->rdaStatus_ = ntohs(p->rdaStatus_);
p->operabilityStatus_ = ntohs(p->operabilityStatus_); p->operabilityStatus_ = ntohs(p->operabilityStatus_);
@ -311,8 +308,18 @@ bool RdaStatusData::Parse(std::istream& is)
p->rmsControlStatus_ = ntohs(p->rmsControlStatus_); p->rmsControlStatus_ = ntohs(p->rmsControlStatus_);
p->performanceCheckStatus_ = ntohs(p->performanceCheckStatus_); p->performanceCheckStatus_ = ntohs(p->performanceCheckStatus_);
SwapArray(p->alarmCodes_); SwapArray(p->alarmCodes_);
// RDA Build 18.0 increased the size of the message from 80 to 120 bytes
if (header().message_size() * 2 > Level2MessageHeader::SIZE + 80)
{
is.read(reinterpret_cast<char*>(&p->signalProcessingOptions_), 2); // 41
is.seekg(36, std::ios_base::cur); // 42-59
is.read(reinterpret_cast<char*>(&p->statusVersion_), 2); // 60
bytesRead += 40;
p->signalProcessingOptions_ = ntohs(p->signalProcessingOptions_); p->signalProcessingOptions_ = ntohs(p->signalProcessingOptions_);
p->statusVersion_ = ntohs(p->statusVersion_); p->statusVersion_ = ntohs(p->statusVersion_);
}
if (!ValidateMessage(is, bytesRead)) if (!ValidateMessage(is, bytesRead))
{ {