mx/Jungfraujoch
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 53 Wiki Activity

New REST+OpenAPI interface

Browse Source
This commit is contained in:
leonarski_f
2023-12-11 12:11:54 +01:00
parent 99f33eaf53
commit 0b69dfb290
120 changed files with 11309 additions and 2532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frame_serialize/CBORStream2Serializer.cpp
+15 -9
View File
@@ -236,17 +236,17 @@ inline void CBOR_ENC_CHANNELS(CborEncoder &encoder, const char* key, const std::
cborErr(cbor_encoder_close_container(&encoder, &arrayEncoder));
}
inline void CBOR_ENC_UNIT_CELL(CborEncoder &encoder, const char* key, const float val[6]) {
inline void CBOR_ENC_UNIT_CELL(CborEncoder &encoder, const char* key, const UnitCell &val) {
CborEncoder mapEncoder;
cborErr(cbor_encode_text_stringz(&encoder, key));
cborErr(cbor_encoder_create_map(&encoder, &mapEncoder, 6));
CBOR_ENC(mapEncoder, "a", val[0]);
CBOR_ENC(mapEncoder, "b", val[1]);
CBOR_ENC(mapEncoder, "c", val[2]);
CBOR_ENC(mapEncoder, "alpha", val[3]);
CBOR_ENC(mapEncoder, "beta", val[4]);
CBOR_ENC(mapEncoder, "gamma", val[5]);
CBOR_ENC(mapEncoder, "a", val.a);
CBOR_ENC(mapEncoder, "b", val.b);
CBOR_ENC(mapEncoder, "c", val.c);
CBOR_ENC(mapEncoder, "alpha", val.alpha);
CBOR_ENC(mapEncoder, "beta", val.beta);
CBOR_ENC(mapEncoder, "gamma", val.gamma);
cborErr(cbor_encoder_close_container(&encoder, &mapEncoder));
}
@@ -264,7 +264,7 @@ inline void CBOR_ENC_USER_DATA(CborEncoder &encoder, const StartMessage& message
CborEncoder mapEncoder;
cborErr(cbor_encode_text_stringz(&encoder, "user_data"));
cborErr(cbor_encoder_create_map(&encoder, &mapEncoder, 23));
cborErr(cbor_encoder_create_map(&encoder, &mapEncoder, CborIndefiniteLength));
CBOR_ENC(mapEncoder, "magic_number", user_data_magic_number);
CBOR_ENC(mapEncoder, "file_prefix", message.file_prefix);
@@ -292,7 +292,13 @@ inline void CBOR_ENC_USER_DATA(CborEncoder &encoder, const StartMessage& message
}
CBOR_ENC(mapEncoder, "compression_block_size", message.compression_block_size);
CBOR_ENC_UNIT_CELL(mapEncoder, "unit_cell", message.unit_cell);
if (message.unit_cell)
CBOR_ENC_UNIT_CELL(mapEncoder, "unit_cell", message.unit_cell.value());
if (message.attenuator_transmission)
CBOR_ENC(mapEncoder, "attenuator_transmission", message.attenuator_transmission.value());
if (message.total_flux)
CBOR_ENC(mapEncoder, "total_flux", message.total_flux.value());
CBOR_ENC(mapEncoder, "source_name", message.source_name);
CBOR_ENC(mapEncoder, "source_name_short", message.source_name_short);