Merge branch '2404-minor-fixes' into 'main'

2404 minor fixes

See merge request jungfraujoch/nextgendcu!51

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Contributing
+
+We actively welcome community contributions, please use a pull request feature.
+
+To accept contributions into our codebase we need to have Contributor License Agreement (CLA) with you or your employer. 
+The CLA is necessary because you own the copyright to your changes, even after your contribution becomes part of our codebase.
+
+Since Jungfraujoch is supported by commercialization grant from the Innosuisse agency, we have to allow our commercial partner 
+(DECTRIS) to use our code without restrictions, and we have to ensure community contributions don't violate the requirement. 
+The obligations apply **only** if your contributions are merged into PSI codebase and don't apply to your fork of the repository.
+
+If you like to make a bigger contribution, like for example new data analysis method beyond what is available currently, 
+please also contact us beforehand to figure out best licensing strategy.
+
+Please contact [Filip Leonarski](mailto:filip.leonarski@psi.ch) for details.

broker/JFJochStateMachine.cpp

@@ -450,6 +450,7 @@ std::optional<MeasurementStatistics> JFJochStateMachine::GetMeasurementStatistic
         tmp.beam_center_drift_pxl = rcv_status->beam_center_drift_pxl;
         tmp.images_collected = rcv_status->images_collected;
         tmp.images_sent = rcv_status->images_sent;
+        tmp.images_skipped = rcv_status->images_skipped;
         tmp.cancelled = rcv_status->cancelled;
         tmp.max_image_number_sent = rcv_status->max_image_number_sent;
         tmp.max_receive_delay = rcv_status->max_receive_delay;

frame_serialize/CBORStream2Serializer.cpp

@@ -466,10 +466,10 @@ void CBORStream2Serializer::SerializeImage(const DataMessage& message) {
     CBOR_ENC(mapEncoder, "adu_histogram", message.adu_histogram);
     CBOR_ENC(mapEncoder, "roi_integrals", message.roi);
     CBOR_ENC(mapEncoder, "user_data", message.user_data);
-    CBOR_ENC(mapEncoder, "data", message.image);
     CBOR_ENC(mapEncoder, "corr_beam_x_pxl", message.corr_beam_x_pxl);
     CBOR_ENC(mapEncoder, "corr_beam_y_pxl", message.corr_beam_y_pxl);
     CBOR_ENC(mapEncoder, "corr_det_dist_mm", message.corr_det_dist_mm);
+    CBOR_ENC(mapEncoder, "data", message.image);
     cborErr(cbor_encoder_close_container(&encoder, &mapEncoder));
 
     curr_size = cbor_encoder_get_buffer_size(&encoder, buffer);