From d46893578a0d09dfdf8decc8166c102da3e3a449 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 13 Nov 2023 15:35:07 +0000 Subject: [PATCH] address comments --- src/tmx/TmxUtils/src/RSU_MIB_4_1.h | 93 +++++++++++++----------------- 1 file changed, 40 insertions(+), 53 deletions(-) diff --git a/src/tmx/TmxUtils/src/RSU_MIB_4_1.h b/src/tmx/TmxUtils/src/RSU_MIB_4_1.h index f88bd96a7..793bf4bea 100644 --- a/src/tmx/TmxUtils/src/RSU_MIB_4_1.h +++ b/src/tmx/TmxUtils/src/RSU_MIB_4_1.h @@ -1,69 +1,56 @@ #pragma once -namespace tmx +namespace tmx::utils::rsu41::mib::oid { - namespace utils - { - namespace rsu41 - { - namespace mib - { - namespace oid - { - /** - * @brief This header file contains a subset of RSU MIB definition from https://github.com/certificationoperatingcouncil/COC_TestSpecs/blob/master/AppNotes/RSU/RSU-MIB.txt - */ - // Contains the ID given to this RSU. - static constexpr const char *RSU_ID_OID = "1.0.15628.4.1.17.4.0"; + /** + * @brief This header file contains a subset of RSU MIB definition from https://github.com/certificationoperatingcouncil/COC_TestSpecs/blob/master/AppNotes/RSU/RSU-MIB.txt + */ + // Contains the ID given to this RSU. + static constexpr const char *RSU_ID_OID = "1.0.15628.4.1.17.4.0"; - // Contains the version of this MIB supported by this RSU, e.g. rsuMIB 4.1 rev201812060000Z - static constexpr const char *RSU_MIB_VERSION = "1.0.15628.4.1.17.1.0"; + // Contains the version of this MIB supported by this RSU, e.g. rsuMIB 4.1 rev201812060000Z + static constexpr const char *RSU_MIB_VERSION = "1.0.15628.4.1.17.1.0"; - // Contains the version of firmware running on this RSU. - static constexpr const char *RSU_FIRMWARE_VERSION = "1.0.15628.4.1.17.2.0"; + // Contains the version of firmware running on this RSU. + static constexpr const char *RSU_FIRMWARE_VERSION = "1.0.15628.4.1.17.2.0"; - // Contains the name of the manufacturer of this RSU. - static constexpr const char *RSU_MANUFACTURER = "1.0.15628.4.1.17.5.0"; + // Contains the name of the manufacturer of this RSU. + static constexpr const char *RSU_MANUFACTURER = "1.0.15628.4.1.17.5.0"; - // Contains GPS NMEA GPGGA output string. - static constexpr const char *RSU_GPS_OUTPUT_STRING = "1.0.15628.4.1.8.5.0"; + // Contains GPS NMEA GPGGA output string. + static constexpr const char *RSU_GPS_OUTPUT_STRING = "1.0.15628.4.1.8.5.0"; - // Immediate Forward Message Index - static constexpr const char *RSU_IFM_INDEX = "1.0.15628.4.1.5.1.1.0"; + // Immediate Forward Message Index + static constexpr const char *RSU_IFM_INDEX = "1.0.15628.4.1.5.1.1.0"; - // Immediate Forward Message PSID. - static constexpr const char *RSU_IFM_PSID = "1.0.15628.4.1.5.1.2.0"; + // Immediate Forward Message PSID. + static constexpr const char *RSU_IFM_PSID = "1.0.15628.4.1.5.1.2.0"; - // Immediate Forward Message DSRC Message ID - static constexpr const char *RSU_IFM_DSRC_MSG_ID = "1.0.15628.4.1.5.1.3.0"; + // Immediate Forward Message DSRC Message ID + static constexpr const char *RSU_IFM_DSRC_MSG_ID = "1.0.15628.4.1.5.1.3.0"; - // Immediate Forward Message Transmit Mode - static constexpr const char *RSU_IFM_TX_MODE = "1.0.15628.4.1.5.1.4.0"; + // Immediate Forward Message Transmit Mode + static constexpr const char *RSU_IFM_TX_MODE = "1.0.15628.4.1.5.1.4.0"; - // DSRC channel set for Immediate Forward Message transmit - static constexpr const char *RSU_IFM_TX_CHANNEL = "1.0.15628.4.1.5.1.5.0"; + // DSRC channel set for Immediate Forward Message transmit + static constexpr const char *RSU_IFM_TX_CHANNEL = "1.0.15628.4.1.5.1.5.0"; - // Set this bit to enable transmission of the message 0=off, 1=on - static constexpr const char *RSU_IFM_ENABLE = "1.0.15628.4.1.5.1.6.0"; + // Set this bit to enable transmission of the message 0=off, 1=on + static constexpr const char *RSU_IFM_ENABLE = "1.0.15628.4.1.5.1.6.0"; - // Create (4) or Destroy (6) row entry - static constexpr const char *RSU_IFM_STATUS = "1.0.15628.4.1.5.1.7.0"; + // Create (4) or Destroy (6) row entry + static constexpr const char *RSU_IFM_STATUS = "1.0.15628.4.1.5.1.7.0"; - // Specifies the current mode of operation of the RSU and provides capability to transition the device into a new mode, e.g. from the current mode to off, etc - static constexpr const char *RSU_MODE = "1.0.15628.4.1.99.0"; + // Specifies the current mode of operation of the RSU and provides capability to transition the device into a new mode, e.g. from the current mode to off, etc + static constexpr const char *RSU_MODE = "1.0.15628.4.1.99.0"; - /* - SYNTAX INTEGER { - bothOp (0), --both Continuous and Alternating modes are operational - altOp (1), --Alternating mode is operational, - --Continuous mode is not operational - contOp (2), --Continuous mode is operational, - --Alternating mode is not operational - noneOp (3) --neither Continuous nor Alternating mode is operational - */ - static constexpr const char *RSU_CHAN_STATUS = "1.0.15628.4.1.19.1.0"; - } // namespace oid - } // namespace mib - } // namespace rsu41 - - } + /* + SYNTAX INTEGER { + bothOp (0), --both Continuous and Alternating modes are operational + altOp (1), --Alternating mode is operational, + --Continuous mode is not operational + contOp (2), --Continuous mode is operational, + --Alternating mode is not operational + noneOp (3) --neither Continuous nor Alternating mode is operational + */ + static constexpr const char *RSU_CHAN_STATUS = "1.0.15628.4.1.19.1.0"; } \ No newline at end of file