Using attribute packed for protocol structs
This commit is contained in:
Jan Käberich
parent
c25fd3912b
commit
20b0b336bb
@ -28,477 +28,6 @@ uint32_t Protocol::CRC32(uint32_t crc, const void *data, uint32_t len) {
|
||||
return ~crc;
|
||||
}
|
||||
|
||||
class Encoder {
|
||||
public:
|
||||
Encoder(uint8_t *buf, uint16_t size) :
|
||||
buf(buf),
|
||||
bufSize(size),
|
||||
usedSize(0),
|
||||
bitpos(0) {
|
||||
memset(buf, 0, size);
|
||||
};
|
||||
template<typename T> bool add(T data) {
|
||||
if(bitpos != 0) {
|
||||
// add padding to next byte boundary
|
||||
bitpos = 0;
|
||||
usedSize++;
|
||||
}
|
||||
if(bufSize - usedSize < (long) sizeof(T)) {
|
||||
// not enough space left
|
||||
return false;
|
||||
}
|
||||
memcpy(&buf[usedSize], &data, sizeof(T));
|
||||
usedSize += sizeof(T);
|
||||
return true;
|
||||
}
|
||||
bool addBits(uint8_t value, uint8_t bits) {
|
||||
if(bits >= 8 || usedSize >= bufSize) {
|
||||
return false;
|
||||
}
|
||||
buf[usedSize] |= (value << bitpos) & 0xFF;
|
||||
bitpos += bits;
|
||||
if(bitpos > 8) {
|
||||
// the value did not fit completely into the current byte
|
||||
if(usedSize >= bufSize - 1) {
|
||||
// already at maximum limit, not enough space for remaining bits
|
||||
return false;
|
||||
}
|
||||
// move access to next byte
|
||||
bitpos -= 8;
|
||||
usedSize++;
|
||||
// add remaining bytes
|
||||
buf[usedSize] = value >> (bits - bitpos);
|
||||
} else if(bitpos == 8) {
|
||||
bitpos = 0;
|
||||
usedSize++;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
uint16_t getSize() const {
|
||||
if(bitpos == 0) {
|
||||
return usedSize;
|
||||
} else {
|
||||
return usedSize + 1;
|
||||
}
|
||||
};
|
||||
|
||||
private:
|
||||
uint8_t *buf;
|
||||
uint16_t bufSize;
|
||||
uint16_t usedSize;
|
||||
uint8_t bitpos;
|
||||
};
|
||||
|
||||
class Decoder {
|
||||
public:
|
||||
Decoder(uint8_t *buf) :
|
||||
buf(buf),
|
||||
usedSize(0),
|
||||
bitpos(0) {};
|
||||
template<typename T> void get(T &t) {
|
||||
if(bitpos != 0) {
|
||||
// add padding to next byte boundary
|
||||
bitpos = 0;
|
||||
usedSize++;
|
||||
}
|
||||
// still enough bytes available
|
||||
memcpy(&t, &buf[usedSize], sizeof(T));
|
||||
usedSize += sizeof(T);
|
||||
}
|
||||
uint8_t getBits(uint8_t bits) {
|
||||
if(bits >= 8) {
|
||||
return 0;
|
||||
}
|
||||
uint8_t mask = 0x00;
|
||||
for(uint8_t i=0;i<bits;i++) {
|
||||
mask <<= 1;
|
||||
mask |= 0x01;
|
||||
}
|
||||
uint8_t value = (buf[usedSize] >> bitpos) & mask;
|
||||
bitpos += bits;
|
||||
if(bitpos > 8) {
|
||||
// the current byte did not contain the complete value
|
||||
// move access to next byte
|
||||
bitpos -= 8;
|
||||
usedSize++;
|
||||
// get remaining bits
|
||||
value |= (buf[usedSize] << (bits - bitpos)) & mask;
|
||||
} else if(bitpos == 8) {
|
||||
bitpos = 0;
|
||||
usedSize++;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
private:
|
||||
uint8_t *buf;
|
||||
uint16_t usedSize;
|
||||
uint8_t bitpos;
|
||||
};
|
||||
|
||||
static Protocol::Datapoint DecodeDatapoint(uint8_t *buf) {
|
||||
Protocol::Datapoint d;
|
||||
Decoder e(buf);
|
||||
e.get<float>(d.real_S11);
|
||||
e.get<float>(d.imag_S11);
|
||||
e.get<float>(d.real_S21);
|
||||
e.get<float>(d.imag_S21);
|
||||
e.get<float>(d.real_S12);
|
||||
e.get<float>(d.imag_S12);
|
||||
e.get<float>(d.real_S22);
|
||||
e.get<float>(d.imag_S22);
|
||||
e.get<uint64_t>(d.frequency);
|
||||
e.get<uint16_t>(d.pointNum);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeDatapoint(Protocol::Datapoint d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
(void) bufSize;
|
||||
// Special case, bypassing the encoder for speed optimizations.
|
||||
// The datapoint is only ever encoded on the device and the
|
||||
// Protocol::Datapoint struct is setup without any padding between
|
||||
// the variables. In this case it is allowed to simply copy its
|
||||
// content into the buffer. Compared to using the encoder, this
|
||||
// saves approximately 40us for each datapoint
|
||||
memcpy(buf, &d, sizeof(d));
|
||||
return sizeof(d);
|
||||
// Encoder e(buf, bufSize);
|
||||
// e.add<float>(d.real_S11);
|
||||
// e.add<float>(d.imag_S11);
|
||||
// e.add<float>(d.real_S21);
|
||||
// e.add<float>(d.imag_S21);
|
||||
// e.add<float>(d.real_S12);
|
||||
// e.add<float>(d.imag_S12);
|
||||
// e.add<float>(d.real_S22);
|
||||
// e.add<float>(d.imag_S22);
|
||||
// e.add<uint64_t>(d.frequency);
|
||||
// e.add<uint16_t>(d.pointNum);
|
||||
// return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::SweepSettings DecodeSweepSettings(uint8_t *buf) {
|
||||
Protocol::SweepSettings d;
|
||||
Decoder e(buf);
|
||||
e.get<uint64_t>(d.f_start);
|
||||
e.get<uint64_t>(d.f_stop);
|
||||
e.get<uint16_t>(d.points);
|
||||
e.get<uint32_t>(d.if_bandwidth);
|
||||
e.get<int16_t>(d.cdbm_excitation);
|
||||
d.excitePort1 = e.getBits(1);
|
||||
d.excitePort2 = e.getBits(1);
|
||||
d.suppressPeaks = e.getBits(1);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeSweepSettings(Protocol::SweepSettings d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add<uint64_t>(d.f_start);
|
||||
e.add<uint64_t>(d.f_stop);
|
||||
e.add<uint16_t>(d.points);
|
||||
e.add<uint32_t>(d.if_bandwidth);
|
||||
e.add<int16_t>(d.cdbm_excitation);
|
||||
e.addBits(d.excitePort1, 1);
|
||||
e.addBits(d.excitePort2, 1);
|
||||
e.addBits(d.suppressPeaks, 1);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::ReferenceSettings DecodeReferenceSettings(uint8_t *buf) {
|
||||
Protocol::ReferenceSettings d;
|
||||
Decoder e(buf);
|
||||
e.get<uint32_t>(d.ExtRefOuputFreq);
|
||||
d.AutomaticSwitch = e.getBits(1);
|
||||
d.UseExternalRef = e.getBits(1);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeReferenceSettings(Protocol::ReferenceSettings d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add<uint32_t>(d.ExtRefOuputFreq);
|
||||
e.addBits(d.AutomaticSwitch, 1);
|
||||
e.addBits(d.UseExternalRef, 1);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::GeneratorSettings DecodeGeneratorSettings(uint8_t *buf) {
|
||||
Protocol::GeneratorSettings d;
|
||||
Decoder e(buf);
|
||||
e.get<uint64_t>(d.frequency);
|
||||
e.get<int16_t>(d.cdbm_level);
|
||||
d.activePort = e.getBits(2);
|
||||
d.applyAmplitudeCorrection = e.getBits(1);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeGeneratorSettings(Protocol::GeneratorSettings d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add<uint64_t>(d.frequency);
|
||||
e.add<int16_t>(d.cdbm_level);
|
||||
e.addBits(d.activePort, 2);
|
||||
e.addBits(d.applyAmplitudeCorrection, 1);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::DeviceInfo DecodeDeviceInfo(uint8_t *buf) {
|
||||
Protocol::DeviceInfo d;
|
||||
Decoder e(buf);
|
||||
e.get(d.ProtocolVersion);
|
||||
e.get(d.FW_major);
|
||||
e.get(d.FW_minor);
|
||||
e.get(d.FW_patch);
|
||||
e.get(d.HW_Revision);
|
||||
d.extRefAvailable = e.getBits(1);
|
||||
d.extRefInUse = e.getBits(1);
|
||||
d.FPGA_configured = e.getBits(1);
|
||||
d.source_locked = e.getBits(1);
|
||||
d.LO1_locked = e.getBits(1);
|
||||
d.ADC_overload = e.getBits(1);
|
||||
d.unlevel = e.getBits(1);
|
||||
e.get(d.temp_source);
|
||||
e.get(d.temp_LO1);
|
||||
e.get(d.temp_MCU);
|
||||
e.get(d.limits_minFreq);
|
||||
e.get(d.limits_maxFreq);
|
||||
e.get(d.limits_minIFBW);
|
||||
e.get(d.limits_maxIFBW);
|
||||
e.get(d.limits_maxPoints);
|
||||
e.get(d.limits_cdbm_min);
|
||||
e.get(d.limits_cdbm_max);
|
||||
e.get(d.limits_minRBW);
|
||||
e.get(d.limits_maxRBW);
|
||||
e.get(d.limits_maxAmplitudePoints);
|
||||
e.get(d.limits_maxFreqHarmonic);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeDeviceInfo(Protocol::DeviceInfo d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
d.ProtocolVersion = Protocol::Version;
|
||||
Encoder e(buf, bufSize);
|
||||
e.add(d.ProtocolVersion);
|
||||
e.add(d.FW_major);
|
||||
e.add(d.FW_minor);
|
||||
e.add(d.FW_patch);
|
||||
e.add(d.HW_Revision);
|
||||
e.addBits(d.extRefAvailable, 1);
|
||||
e.addBits(d.extRefInUse, 1);
|
||||
e.addBits(d.FPGA_configured, 1);
|
||||
e.addBits(d.source_locked, 1);
|
||||
e.addBits(d.LO1_locked, 1);
|
||||
e.addBits(d.ADC_overload, 1);
|
||||
e.addBits(d.unlevel, 1);
|
||||
e.add(d.temp_source);
|
||||
e.add(d.temp_LO1);
|
||||
e.add(d.temp_MCU);
|
||||
e.add(d.limits_minFreq);
|
||||
e.add(d.limits_maxFreq);
|
||||
e.add(d.limits_minIFBW);
|
||||
e.add(d.limits_maxIFBW);
|
||||
e.add(d.limits_maxPoints);
|
||||
e.add(d.limits_cdbm_min);
|
||||
e.add(d.limits_cdbm_max);
|
||||
e.add(d.limits_minRBW);
|
||||
e.add(d.limits_maxRBW);
|
||||
e.add(d.limits_maxAmplitudePoints);
|
||||
e.add(d.limits_maxFreqHarmonic);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::ManualStatus DecodeStatus(uint8_t *buf) {
|
||||
Protocol::ManualStatus d;
|
||||
Decoder e(buf);
|
||||
e.get<int16_t>(d.port1min);
|
||||
e.get<int16_t>(d.port1max);
|
||||
e.get<int16_t>(d.port2min);
|
||||
e.get<int16_t>(d.port2max);
|
||||
e.get<int16_t>(d.refmin);
|
||||
e.get<int16_t>(d.refmax);
|
||||
e.get<float>(d.port1real);
|
||||
e.get<float>(d.port1imag);
|
||||
e.get<float>(d.port2real);
|
||||
e.get<float>(d.port2imag);
|
||||
e.get<float>(d.refreal);
|
||||
e.get<float>(d.refimag);
|
||||
e.get<uint8_t>(d.temp_source);
|
||||
e.get<uint8_t>(d.temp_LO);
|
||||
d.source_locked = e.getBits( 1);
|
||||
d.LO_locked = e.getBits(1);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeStatus(Protocol::ManualStatus d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add<int16_t>(d.port1min);
|
||||
e.add<int16_t>(d.port1max);
|
||||
e.add<int16_t>(d.port2min);
|
||||
e.add<int16_t>(d.port2max);
|
||||
e.add<int16_t>(d.refmin);
|
||||
e.add<int16_t>(d.refmax);
|
||||
e.add<float>(d.port1real);
|
||||
e.add<float>(d.port1imag);
|
||||
e.add<float>(d.port2real);
|
||||
e.add<float>(d.port2imag);
|
||||
e.add<float>(d.refreal);
|
||||
e.add<float>(d.refimag);
|
||||
e.add<uint8_t>(d.temp_source);
|
||||
e.add<uint8_t>(d.temp_LO);
|
||||
e.addBits(d.source_locked, 1);
|
||||
e.addBits(d.LO_locked, 1);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::ManualControl DecodeManualControl(uint8_t *buf) {
|
||||
Protocol::ManualControl d;
|
||||
Decoder e(buf);
|
||||
d.SourceHighCE = e.getBits(1);
|
||||
d.SourceHighRFEN = e.getBits(1);
|
||||
d.SourceHighPower = e.getBits(2);
|
||||
d.SourceHighLowpass = e.getBits(2);
|
||||
e.get<uint64_t>(d.SourceHighFrequency);
|
||||
d.SourceLowEN = e.getBits(1);
|
||||
d.SourceLowPower = e.getBits( 2);
|
||||
e.get<uint32_t>(d.SourceLowFrequency);
|
||||
d.attenuator = e.getBits(7);
|
||||
d.SourceHighband = e.getBits(1);
|
||||
d.AmplifierEN = e.getBits(1);
|
||||
d.PortSwitch = e.getBits(1);
|
||||
d.LO1CE = e.getBits(1);
|
||||
d.LO1RFEN = e.getBits(1);
|
||||
e.get<uint64_t>(d.LO1Frequency);
|
||||
d.LO2EN = e.getBits(1);
|
||||
e.get<uint32_t>(d.LO2Frequency);
|
||||
d.Port1EN = e.getBits(1);
|
||||
d.Port2EN = e.getBits(1);
|
||||
d.RefEN = e.getBits(1);
|
||||
e.get<uint32_t>(d.Samples);
|
||||
d.WindowType = e.getBits(2);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeManualControl(Protocol::ManualControl d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.addBits(d.SourceHighCE, 1);
|
||||
e.addBits(d.SourceHighRFEN, 1);
|
||||
e.addBits(d.SourceHighPower, 2);
|
||||
e.addBits(d.SourceHighLowpass, 2);
|
||||
e.add<uint64_t>(d.SourceHighFrequency);
|
||||
e.addBits(d.SourceLowEN, 1);
|
||||
e.addBits(d.SourceLowPower, 2);
|
||||
e.add<uint32_t>(d.SourceLowFrequency);
|
||||
e.addBits(d.attenuator, 7);
|
||||
e.addBits(d.SourceHighband, 1);
|
||||
e.addBits(d.AmplifierEN, 1);
|
||||
e.addBits(d.PortSwitch, 1);
|
||||
e.addBits(d.LO1CE, 1);
|
||||
e.addBits(d.LO1RFEN, 1);
|
||||
e.add<uint64_t>(d.LO1Frequency);
|
||||
e.addBits(d.LO2EN, 1);
|
||||
e.add<uint32_t>(d.LO2Frequency);
|
||||
e.addBits(d.Port1EN, 1);
|
||||
e.addBits(d.Port2EN, 1);
|
||||
e.addBits(d.RefEN, 1);
|
||||
e.add<uint32_t>(d.Samples);
|
||||
e.addBits(d.WindowType, 2);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::SpectrumAnalyzerSettings DecodeSpectrumAnalyzerSettings(uint8_t *buf) {
|
||||
Protocol::SpectrumAnalyzerSettings d;
|
||||
Decoder e(buf);
|
||||
e.get<uint64_t>(d.f_start);
|
||||
e.get<uint64_t>(d.f_stop);
|
||||
e.get<uint32_t>(d.RBW);
|
||||
e.get<uint16_t>(d.pointNum);
|
||||
d.WindowType = e.getBits(2);
|
||||
d.SignalID = e.getBits(1);
|
||||
d.Detector = e.getBits(3);
|
||||
d.UseDFT = e.getBits(1);
|
||||
d.applyReceiverCorrection = e.getBits(1);
|
||||
d.trackingGenerator = e.getBits(1);
|
||||
d.applySourceCorrection = e.getBits(1);
|
||||
d.trackingGeneratorPort = e.getBits(1);
|
||||
e.get(d.trackingGeneratorOffset);
|
||||
e.get(d.trackingPower);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeSpectrumAnalyzerSettings(Protocol::SpectrumAnalyzerSettings d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add<uint64_t>(d.f_start);
|
||||
e.add<uint64_t>(d.f_stop);
|
||||
e.add<uint32_t>(d.RBW);
|
||||
e.add<uint16_t>(d.pointNum);
|
||||
e.addBits(d.WindowType, 2);
|
||||
e.addBits(d.SignalID, 1);
|
||||
e.addBits(d.Detector, 3);
|
||||
e.addBits(d.UseDFT, 1);
|
||||
e.addBits(d.applyReceiverCorrection, 1);
|
||||
e.addBits(d.trackingGenerator, 1);
|
||||
e.addBits(d.applySourceCorrection, 1);
|
||||
e.addBits(d.trackingGeneratorPort, 1);
|
||||
e.add(d.trackingGeneratorOffset);
|
||||
e.add(d.trackingPower);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::SpectrumAnalyzerResult DecodeSpectrumAnalyzerResult(uint8_t *buf) {
|
||||
Protocol::SpectrumAnalyzerResult d;
|
||||
Decoder e(buf);
|
||||
e.get<float>(d.port1);
|
||||
e.get<float>(d.port2);
|
||||
e.get<uint64_t>(d.frequency);
|
||||
e.get<uint16_t>(d.pointNum);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeSpectrumAnalyzerResult(Protocol::SpectrumAnalyzerResult d, uint8_t *buf,
|
||||
uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add<float>(d.port1);
|
||||
e.add<float>(d.port2);
|
||||
e.add<uint64_t>(d.frequency);
|
||||
e.add<uint16_t>(d.pointNum);
|
||||
return e.getSize();
|
||||
}
|
||||
|
||||
static Protocol::FirmwarePacket DecodeFirmwarePacket(uint8_t *buf) {
|
||||
Protocol::FirmwarePacket d;
|
||||
// simple packet format, memcpy is faster than using the decoder
|
||||
memcpy(&d.address, buf, 4);
|
||||
buf += 4;
|
||||
memcpy(d.data, buf, Protocol::FirmwareChunkSize);
|
||||
return d;
|
||||
}
|
||||
static int16_t EncodeFirmwarePacket(const Protocol::FirmwarePacket &d, uint8_t *buf, uint16_t bufSize) {
|
||||
if(bufSize < 4 + Protocol::FirmwareChunkSize) {
|
||||
// unable to encode, not enough space
|
||||
return -1;
|
||||
}
|
||||
// simple packet format, memcpy is faster than using the encoder
|
||||
memcpy(buf, &d.address, 4);
|
||||
buf += 4;
|
||||
memcpy(buf, d.data, Protocol::FirmwareChunkSize);
|
||||
return 4 + Protocol::FirmwareChunkSize;
|
||||
}
|
||||
|
||||
static int16_t EncodeAmplitudeCorrectionPoint(
|
||||
Protocol::AmplitudeCorrectionPoint d, uint8_t *buf, uint16_t bufSize) {
|
||||
Encoder e(buf, bufSize);
|
||||
e.add(d.totalPoints);
|
||||
e.add(d.pointNum);
|
||||
e.add(d.freq);
|
||||
e.add(d.port1);
|
||||
e.add(d.port2);
|
||||
return e.getSize();
|
||||
}
|
||||
static Protocol::AmplitudeCorrectionPoint DecodeAmplitudeCorrectionPoint(uint8_t *buf) {
|
||||
Protocol::AmplitudeCorrectionPoint d;
|
||||
Decoder e(buf);
|
||||
e.get(d.totalPoints);
|
||||
e.get(d.pointNum);
|
||||
e.get(d.freq);
|
||||
e.get(d.port1);
|
||||
e.get(d.port2);
|
||||
return d;
|
||||
}
|
||||
|
||||
uint16_t Protocol::DecodeBuffer(uint8_t *buf, uint16_t len, PacketInfo *info) {
|
||||
if (!info || !len) {
|
||||
info->type = PacketType::None;
|
||||
@ -530,117 +59,46 @@ uint16_t Protocol::DecodeBuffer(uint8_t *buf, uint16_t len, PacketInfo *info) {
|
||||
return data - buf;
|
||||
}
|
||||
|
||||
// /* The complete frame has been received, check checksum */
|
||||
// auto type = (PacketType) data[3];
|
||||
// uint32_t crc = *(uint32_t*) &data[length - 4];
|
||||
// if(type != PacketType::Datapoint) {
|
||||
// uint32_t compare = CRC32(0, data, length - 4);
|
||||
// if(crc != compare) {
|
||||
// // CRC mismatch, remove header
|
||||
// data += 1;
|
||||
// info->type = PacketType::None;
|
||||
// return data - buf;
|
||||
// }
|
||||
// } else {
|
||||
// // Datapoint has the CRC set to zero
|
||||
// if(crc != 0x00000000) {
|
||||
// data += 1;
|
||||
// info->type = PacketType::None;
|
||||
// return data - buf;
|
||||
// }
|
||||
// }
|
||||
|
||||
// Valid packet, extract packet info
|
||||
info->type = (PacketType) data[3];
|
||||
switch (info->type) {
|
||||
case PacketType::Datapoint:
|
||||
info->datapoint = DecodeDatapoint(&data[4]);
|
||||
break;
|
||||
case PacketType::SweepSettings:
|
||||
info->settings = DecodeSweepSettings(&data[4]);
|
||||
break;
|
||||
case PacketType::Reference:
|
||||
info->reference = DecodeReferenceSettings(&data[4]);
|
||||
break;
|
||||
case PacketType::DeviceInfo:
|
||||
info->info = DecodeDeviceInfo(&data[4]);
|
||||
break;
|
||||
case PacketType::Status:
|
||||
info->status = DecodeStatus(&data[4]);
|
||||
break;
|
||||
case PacketType::ManualControl:
|
||||
info->manual = DecodeManualControl(&data[4]);
|
||||
break;
|
||||
case PacketType::FirmwarePacket:
|
||||
info->firmware = DecodeFirmwarePacket(&data[4]);
|
||||
break;
|
||||
case PacketType::Generator:
|
||||
info->generator = DecodeGeneratorSettings(&data[4]);
|
||||
break;
|
||||
case PacketType::SpectrumAnalyzerSettings:
|
||||
info->spectrumSettings = DecodeSpectrumAnalyzerSettings(&data[4]);
|
||||
break;
|
||||
case PacketType::SpectrumAnalyzerResult:
|
||||
info->spectrumResult = DecodeSpectrumAnalyzerResult(&data[4]);
|
||||
break;
|
||||
case PacketType::SourceCalPoint:
|
||||
case PacketType::ReceiverCalPoint:
|
||||
info->amplitudePoint = DecodeAmplitudeCorrectionPoint(&data[4]);
|
||||
break;
|
||||
case PacketType::Ack:
|
||||
case PacketType::PerformFirmwareUpdate:
|
||||
case PacketType::ClearFlash:
|
||||
case PacketType::Nack:
|
||||
case PacketType::RequestDeviceInfo:
|
||||
case PacketType::RequestReceiverCal:
|
||||
case PacketType::RequestSourceCal:
|
||||
case PacketType::SetIdle:
|
||||
// no payload, nothing to do
|
||||
break;
|
||||
case PacketType::None:
|
||||
break;
|
||||
/* The complete frame has been received, check checksum */
|
||||
auto type = (PacketType) data[3];
|
||||
uint32_t crc = *(uint32_t*) &data[length - 4];
|
||||
if(type != PacketType::Datapoint) {
|
||||
uint32_t compare = CRC32(0, data, length - 4);
|
||||
if(crc != compare) {
|
||||
// CRC mismatch, remove header
|
||||
data += 1;
|
||||
info->type = PacketType::None;
|
||||
return data - buf;
|
||||
}
|
||||
} else {
|
||||
// Datapoint has the CRC set to zero
|
||||
if(crc != 0x00000000) {
|
||||
data += 1;
|
||||
info->type = PacketType::None;
|
||||
return data - buf;
|
||||
}
|
||||
}
|
||||
|
||||
// Valid packet, copy packet type and payload
|
||||
memcpy(info, &data[3], length - 7);
|
||||
return data - buf + length;
|
||||
}
|
||||
|
||||
uint16_t Protocol::EncodePacket(const PacketInfo &packet, uint8_t *dest, uint16_t destsize) {
|
||||
int16_t payload_size = 0;
|
||||
switch (packet.type) {
|
||||
case PacketType::Datapoint:
|
||||
payload_size = EncodeDatapoint(packet.datapoint, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::SweepSettings:
|
||||
payload_size = EncodeSweepSettings(packet.settings, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::Reference:
|
||||
payload_size = EncodeReferenceSettings(packet.reference, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::DeviceInfo:
|
||||
payload_size = EncodeDeviceInfo(packet.info, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::Status:
|
||||
payload_size = EncodeStatus(packet.status, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::ManualControl:
|
||||
payload_size = EncodeManualControl(packet.manual, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::FirmwarePacket:
|
||||
payload_size = EncodeFirmwarePacket(packet.firmware, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::Generator:
|
||||
payload_size = EncodeGeneratorSettings(packet.generator, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::SpectrumAnalyzerSettings:
|
||||
payload_size = EncodeSpectrumAnalyzerSettings(packet.spectrumSettings, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::SpectrumAnalyzerResult:
|
||||
payload_size = EncodeSpectrumAnalyzerResult(packet.spectrumResult, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::Datapoint: payload_size = sizeof(packet.datapoint); break;
|
||||
case PacketType::SweepSettings: payload_size = sizeof(packet.settings); break;
|
||||
case PacketType::Reference: payload_size = sizeof(packet.reference); break;
|
||||
case PacketType::DeviceInfo: payload_size = sizeof(packet.info); break;
|
||||
case PacketType::Status: payload_size = sizeof(packet.status); break;
|
||||
case PacketType::ManualControl: payload_size = sizeof(packet.manual); break;
|
||||
case PacketType::FirmwarePacket: payload_size = sizeof(packet.firmware); break;
|
||||
case PacketType::Generator: payload_size = sizeof(packet.generator); break;
|
||||
case PacketType::SpectrumAnalyzerSettings: payload_size = sizeof(packet.spectrumSettings); break;
|
||||
case PacketType::SpectrumAnalyzerResult: payload_size = sizeof(packet.spectrumResult); break;
|
||||
case PacketType::SourceCalPoint:
|
||||
case PacketType::ReceiverCalPoint:
|
||||
payload_size = EncodeAmplitudeCorrectionPoint(packet.amplitudePoint, &dest[4], destsize - 8);
|
||||
break;
|
||||
case PacketType::ReceiverCalPoint: payload_size = sizeof(packet.amplitudePoint); break;
|
||||
case PacketType::Ack:
|
||||
case PacketType::PerformFirmwareUpdate:
|
||||
case PacketType::ClearFlash:
|
||||
@ -649,7 +107,7 @@ uint16_t Protocol::EncodePacket(const PacketInfo &packet, uint8_t *dest, uint16_
|
||||
case PacketType::RequestSourceCal:
|
||||
case PacketType::RequestReceiverCal:
|
||||
case PacketType::SetIdle:
|
||||
// no payload, nothing to do
|
||||
// no payload
|
||||
break;
|
||||
case PacketType::None:
|
||||
break;
|
||||
@ -662,7 +120,7 @@ uint16_t Protocol::EncodePacket(const PacketInfo &packet, uint8_t *dest, uint16_
|
||||
dest[0] = header;
|
||||
uint16_t overall_size = payload_size + 8;
|
||||
memcpy(&dest[1], &overall_size, 2);
|
||||
dest[3] = (int) packet.type;
|
||||
memcpy(&dest[3], &packet, payload_size + 1); // one additional byte for the packet type
|
||||
// Calculate checksum
|
||||
uint32_t crc = 0x00000000;
|
||||
if(packet.type == PacketType::Datapoint) {
|
||||
|
||||
@ -6,7 +6,7 @@ namespace Protocol {
|
||||
|
||||
static constexpr uint16_t Version = 4;
|
||||
|
||||
// When changing/adding/removing variables from these structs also adjust the decode/encode functions in Protocol.cpp
|
||||
#pragma pack(push, 1)
|
||||
|
||||
using Datapoint = struct _datapoint {
|
||||
float real_S11, imag_S11;
|
||||
@ -193,6 +193,8 @@ using PacketInfo = struct _packetinfo {
|
||||
};
|
||||
};
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
uint32_t CRC32(uint32_t crc, const void *data, uint32_t len);
|
||||
uint16_t DecodeBuffer(uint8_t *buf, uint16_t len, PacketInfo *info);
|
||||
uint16_t EncodePacket(const PacketInfo &packet, uint8_t *dest, uint16_t destsize);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user