ika-rwth-aachen · jpbusch · Jan 14, 2025 · Dec 18, 2023 · Dec 19, 2023 · Dec 19, 2023
diff --git a/...its_msgs_utils/include/etsi_its_msgs_utils/impl/asn1_primitives/asn1_primitives_getters.h b/...its_msgs_utils/include/etsi_its_msgs_utils/impl/asn1_primitives/asn1_primitives_getters.h
@@ -0,0 +1,67 @@
+/*
+=============================================================================
+MIT License
+
+Copyright (c) 2023-2024 Institute for Automotive Engineering (ika), RWTH Aachen University
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=============================================================================
+*/
+
+#ifndef ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_GETTERS_H
+#define ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_GETTERS_H
+
+/**
+ * @file impl/asn1_primitives_getters.h
+ * @brief File containing getter-functions that are used in the context of ETIS ITS Messages related to ASN.1 datatype primitives
+ */
+
+/**
+ * @brief Get a Bit String in form of bool vector
+ *
+ * @param buffer as uint8_t vector
+ * @param bits_unused number of bits to ignore at the end of the bit string
+ * @return std::vector<bool>
+ */
+inline std::vector<bool> getBitString(const std::vector<uint8_t>& buffer, const int bits_unused) {
+  // bit string size
+  const int bits_per_byte = 8;
+  const int n_bytes = buffer.size();
+  const int n_bits = n_bytes * bits_per_byte;
+  std::vector<bool> bits;
+  bits.resize(n_bits - bits_unused, 0);
+
+  // loop over bytes in reverse order
+  for (int byte_idx = n_bytes - 1; byte_idx >= 0; byte_idx--) {
+      // loop over bits in a byte
+      for (int bit_idx_in_byte = bits_per_byte - 1; bit_idx_in_byte >= 0; bit_idx_in_byte--) {
+
+        // map bit index in byte to bit index in total bitstring
+        int bit_idx = (n_bytes - byte_idx - 1) * bits_per_byte + bit_idx_in_byte;
+        if (byte_idx == 0 && bit_idx < bits_unused) break;
+
+        // extract bit from bitstring and set output array entry appropriately
+        bool byte_has_true_bit = buffer[byte_idx] & (1 << bit_idx_in_byte);
+        if (byte_has_true_bit) bits[bits_per_byte-bit_idx-1] = true;
+      }
+    }
+  return bits;
+}
+
+#endif  // ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_GETTERS_H
diff --git a/...its_msgs_utils/include/etsi_its_msgs_utils/impl/asn1_primitives/asn1_primitives_setters.h b/...its_msgs_utils/include/etsi_its_msgs_utils/impl/asn1_primitives/asn1_primitives_setters.h
@@ -0,0 +1,71 @@
+/*
+=============================================================================
+MIT License
+
+Copyright (c) 2023-2024 Institute for Automotive Engineering (ika), RWTH Aachen University
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=============================================================================
+*/
+
+#ifndef ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_SETTERS_H
+#define ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_SETTERS_H
+
+/**
+ * @file impl/asn1_primitives_setters.h
+ * @brief File containing setter-functions that are used in the context of ETIS ITS Messages related to ASN.1 datatype primitives
+ */
+
+/**
+ * @brief Set a Bit String by a vector of bools
+ *
+ * @tparam T
+ * @param bitstring BitString to set
+ * @param bits vector of bools
+ */
+template <typename T>
+inline void setBitString(T& bitstring, const std::vector<bool>& bits) {
+  // bit string size
+  const int bits_per_byte = 8;
+  const int n_bytes = (bits.size() - 1) / bits_per_byte + 1;
+  const int n_bits = n_bytes * bits_per_byte;
+
+  // init output
+  bitstring.bits_unused = n_bits - bits.size();
+  bitstring.value = std::vector<uint8_t>(n_bytes);
+
+  // loop over all bytes in reverse order
+  for (int byte_idx = n_bytes - 1; byte_idx >= 0; byte_idx--) {
+
+    // loop over bits in a byte
+    for (int bit_idx_in_byte = bits_per_byte - 1; bit_idx_in_byte >= 0; bit_idx_in_byte--) {
+
+      // map bit index in byte to bit index in total bitstring
+      int bit_idx = (n_bytes - byte_idx - 1) * bits_per_byte + bit_idx_in_byte;
+      if (byte_idx == 0 && bit_idx < bitstring.bits_unused) break;
+
+      // set bit in output bitstring appropriately
+      if (bit_idx < bits.size()) {
+        bitstring.value[byte_idx] |= bits[bits_per_byte - bit_idx - 1] << bit_idx_in_byte;
+      }
+    }
+  }
+}
+
+#endif // ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_SETTERS_H
diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_access.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_access.h
@@ -29,16 +29,18 @@ SOFTWARE.
  * @brief Main CAM access implementation header
  */
 
+#undef ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_GETTERS_H
+#undef ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_SETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_GETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_SETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_UTILS_H
-#undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_CHECKS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_GETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_SETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V1_3_1_GETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V1_3_1_SETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V2_1_1_GETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V2_1_1_SETTERS_H
+#undef ETSI_ITS_MSGS_UTILS_IMPL_CHECKS_H
 
 #pragma once
 
@@ -48,6 +50,7 @@ SOFTWARE.
 
 #include <GeographicLib/UTMUPS.hpp>
 
+#include <etsi_its_msgs_utils/impl/constants.h>
 #include <etsi_its_msgs_utils/impl/cam/cam_getters.h>
 #include <etsi_its_msgs_utils/impl/cam/cam_setters.h>
 

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_getters_common.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_getters_common.h
@@ -32,6 +32,8 @@ SOFTWARE.
 #ifndef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_GETTERS_COMMON_H
 #define ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_GETTERS_COMMON_H
 
+#include <etsi_its_msgs_utils/impl/asn1_primitives/asn1_primitives_getters.h>
+
 /**
  * @brief Get the Station ID object
  *

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_setters.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_setters.h
@@ -31,8 +31,6 @@ SOFTWARE.
 
 #pragma once
 
-#include <etsi_its_msgs_utils/impl/constants.h>
-
 namespace etsi_its_cam_msgs::access {
 
 #include <etsi_its_msgs_utils/impl/cdd/cdd_v1-3-1_setters.h>

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_setters_common.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_setters_common.h
@@ -32,7 +32,9 @@ SOFTWARE.
 #ifndef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_SETTERS_COMMON_H
 #define ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_SETTERS_COMMON_H
 
+#include <etsi_its_msgs_utils/impl/checks.h>
 #include <etsi_its_msgs_utils/impl/constants.h>
+#include <etsi_its_msgs_utils/impl/asn1_primitives/asn1_primitives_setters.h>
 
 /**
  * @brief Set the GenerationDeltaTime-Value

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_ts_access.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_ts_access.h
@@ -29,16 +29,18 @@ SOFTWARE.
  * @brief Main CAM TS access implementation header
  */
 
+#undef ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_GETTERS_H
+#undef ETSI_ITS_MSGS_UTILS_IMPL_ASN1_PRIMITIVES_ASN1_PRIMITIVES_SETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_GETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_SETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_UTILS_H
-#undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_CHECKS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_GETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_SETTERS_COMMON_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V1_3_1_GETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V1_3_1_SETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V2_1_1_GETTERS_H
 #undef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V2_1_1_SETTERS_H
+#undef ETSI_ITS_MSGS_UTILS_IMPL_CHECKS_H
 
 #pragma once
 
@@ -48,6 +50,7 @@ SOFTWARE.
 
 #include <GeographicLib/UTMUPS.hpp>
 
+#include <etsi_its_msgs_utils/impl/constants.h>
 #include <etsi_its_msgs_utils/impl/cam/cam_ts_getters.h>
 #include <etsi_its_msgs_utils/impl/cam/cam_ts_setters.h>
 

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_ts_setters.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_ts_setters.h
@@ -31,8 +31,6 @@ SOFTWARE.
 
 #pragma once
 
-#include <etsi_its_msgs_utils/impl/constants.h>
-
 namespace etsi_its_cam_ts_msgs::access {
 
 #include <etsi_its_msgs_utils/impl/cdd/cdd_v2-1-1_setters.h>

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_utils.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cam/cam_utils.h
@@ -29,7 +29,7 @@ SOFTWARE.
  * @brief Utility functions for the ETSI ITS CAM (EN and TS)
  */
 
-#include <etsi_its_msgs_utils/impl/cdd/cdd_checks.h>
+#include <etsi_its_msgs_utils/impl/checks.h>
 #include <etsi_its_msgs_utils/impl/constants.h>
 
 #ifndef ETSI_ITS_MSGS_UTILS_IMPL_CAM_CAM_UTILS_H

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_getters_common.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_getters_common.h
@@ -74,37 +74,6 @@ inline double getAltitude(const Altitude& altitude) { return ((double)altitude.a
  */
 inline double getSpeed(const Speed& speed) { return ((double)speed.speed_value.value) * 1e-2; }
 
-/**
- * @brief Get a Bit String in form of bool vector
- *
- * @param buffer as uint8_t vector
- * @param bits_unused number of bits to ignore at the end of the bit string
- * @return std::vector<bool>
- */
-inline std::vector<bool> getBitString(const std::vector<uint8_t>& buffer, const int bits_unused) {
-  // bit string size
-  const int bits_per_byte = 8;
-  const int n_bytes = buffer.size();
-  const int n_bits = n_bytes * bits_per_byte;
-  std::vector<bool> bits;
-  bits.resize(n_bits - bits_unused, 0);
-
-  // loop over bytes in reverse order
-  for (int byte_idx = n_bytes - 1; byte_idx >= 0; byte_idx--) {
-    // loop over bits in a byte
-    for (int bit_idx_in_byte = 0; bit_idx_in_byte < bits_per_byte; bit_idx_in_byte++) {
-      // map bit index in byte to bit index in total bitstring
-      int bit_idx = (n_bytes - byte_idx - 1) * bits_per_byte + bit_idx_in_byte;
-      if (byte_idx == 0 && bit_idx >= n_bits - bits_unused) break;
-
-      // extract bit from bitstring and set output array entry appropriately
-      bool byte_has_true_bit = buffer[byte_idx] & (1 << bit_idx_in_byte);
-      if (byte_has_true_bit) bits[bit_idx] = 1;
-    }
-  }
-  return bits;
-}
-
 /**
  * @brief Get the UTM Position defined by the given ReferencePosition
  *

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_setters_common.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_setters_common.h
@@ -32,7 +32,7 @@ SOFTWARE.
 #ifndef ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_SETTERS_COMMON_H
 #define ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_SETTERS_COMMON_H
 
-#include <etsi_its_msgs_utils/impl/cdd/cdd_checks.h>
+#include <etsi_its_msgs_utils/impl/checks.h>
 #include <etsi_its_msgs_utils/impl/constants.h>
 #include <GeographicLib/UTMUPS.hpp>
 #include <cstring>
@@ -186,36 +186,4 @@ inline void setFromUTMPosition(T& reference_position, const gm::PointStamped& ut
   setReferencePosition(reference_position, latitude, longitude, utm_position.point.z);
 }
 
-/**
- * @brief Set a Bit String by a vector of bools
- *
- * @tparam T
- * @param bitstring BitString to set
- * @param bits vector of bools
- */
-template <typename T>
-inline void setBitString(T& bitstring, const std::vector<bool>& bits) {
-  // bit string size
-  const int bits_per_byte = 8;
-  const int n_bytes = (bits.size() - 1) / bits_per_byte + 1;
-  const int n_bits = n_bytes * bits_per_byte;
-
-  // init output
-  bitstring.bits_unused = n_bits - bits.size();
-  bitstring.value = std::vector<uint8_t>(n_bytes);
-
-  // loop over all bytes in reverse order
-  for (int byte_idx = n_bytes - 1; byte_idx >= 0; byte_idx--) {
-    // loop over bits in a byte
-    for (int bit_idx_in_byte = 0; bit_idx_in_byte < bits_per_byte; bit_idx_in_byte++) {
-      // map bit index in byte to bit index in total bitstring
-      int bit_idx = (n_bytes - byte_idx - 1) * bits_per_byte + bit_idx_in_byte;
-      if (byte_idx == 0 && bit_idx >= n_bits - bitstring.bits_unused) break;
-
-      // set bit in output bitstring appropriately
-      bitstring.value[byte_idx] |= bits[bit_idx] << bit_idx_in_byte;
-    }
-  }
-}
-
 #endif  // ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_SETTERS_COMMON_H
diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_v1-3-1_setters.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_v1-3-1_setters.h
@@ -33,7 +33,7 @@ SOFTWARE.
 #define ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V1_3_1_SETTERS_H
 
 #include <etsi_its_msgs_utils/impl/cdd/cdd_setters_common.h>
-#include <etsi_its_msgs_utils/impl/cdd/cdd_checks.h>
+#include <etsi_its_msgs_utils/impl/checks.h>
 #include <GeographicLib/UTMUPS.hpp>
 #include <cstring>
 

diff --git a/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_v2-1-1_setters.h b/etsi_its_msgs_utils/include/etsi_its_msgs_utils/impl/cdd/cdd_v2-1-1_setters.h
@@ -33,8 +33,7 @@ SOFTWARE.
 #define ETSI_ITS_MSGS_UTILS_IMPL_CDD_CDD_V2_1_1_SETTERS_H
 
 #include <etsi_its_msgs_utils/impl/cdd/cdd_setters_common.h>
-#include <etsi_its_msgs_utils/impl/cdd/cdd_checks.h>
-#include <etsi_its_msgs_utils/impl/constants.h>
+#include <etsi_its_msgs_utils/impl/checks.h>
 #include <GeographicLib/UTMUPS.hpp>
 #include <cstring>