Ref T730, use physical unit

This commit is contained in:
Klaus Basan
2019-10-07 18:00:29 +02:00
committed by Mat Sutcliffe
parent 9bbc993a62
commit b0f1f5fae4

View File

@@ -51,7 +51,7 @@ namespace BlackCore
CryptoDtoChannelConfigDto dto; CryptoDtoChannelConfigDto dto;
dto.channelTag = json.value("channelTag").toString(); dto.channelTag = json.value("channelTag").toString();
dto.aeadReceiveKey = QByteArray::fromBase64(json.value("aeadReceiveKey").toString().toLocal8Bit()); dto.aeadReceiveKey = QByteArray::fromBase64(json.value("aeadReceiveKey").toString().toLocal8Bit());
dto.aeadTransmitKey = QByteArray::fromBase64(json.value("aeadTransmitKey").toString().toLocal8Bit()); dto.aeadTransmitKey = QByteArray::fromBase64(json.value("aeadTransmitKey").toString().toLocal8Bit());
dto.hmacKey = QByteArray::fromBase64(json.value("hmacKey").toString().toLocal8Bit()); dto.hmacKey = QByteArray::fromBase64(json.value("hmacKey").toString().toLocal8Bit());
return dto; return dto;
@@ -163,8 +163,8 @@ namespace BlackCore
//! Properties @{ //! Properties @{
QUuid id; QUuid id;
QString name; QString name;
quint32 frequency; quint32 frequencyHz;
quint32 frequencyAlias; quint32 frequencyAliasHz;
//! @} //! @}
//! From JSON //! From JSON
@@ -173,8 +173,8 @@ namespace BlackCore
StationDto dto; StationDto dto;
dto.id = json.value("id").toString(); dto.id = json.value("id").toString();
dto.name = json.value("name").toString(); dto.name = json.value("name").toString();
dto.frequency = static_cast<quint32>(json.value("frequency").toInt()); dto.frequencyHz = static_cast<quint32>(json.value("frequency").toInt());
dto.frequencyAlias = static_cast<quint32>(json.value("frequencyAlias").toInt()); dto.frequencyAliasHz = static_cast<quint32>(json.value("frequencyAlias").toInt());
return dto; return dto;
} }
}; };