Format renaming

Change-Id: I40c28f584c444ef806c2adcc55d443a145abb0d2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp
index a08df64..e9e660d 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp
@@ -85,7 +85,7 @@ private:
                                                                                ///< recurring request. If the request is not reecurring, this attribute is not used.
        frequency_clock_t timeout_clock_; ///< timeout_clock_ - A frequency_clock_t object to monitor how long it's been since
                                                                          ///< this request was sent.
-       utils::socketcan_bcm_t socket_; ///< tx_socket_ - A BCM socket setup to send cyclic message to CAN ID 7DF.
+       utils::socketcan_bcm_t socket_; ///< socket_ - A BCM socket setup to send cyclic message to CAN ID 7DF.
 public:
        bool operator==(const active_diagnostic_request_t& b);
        active_diagnostic_request_t& operator=(const active_diagnostic_request_t& adr);

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
index 66a4d73..f9f2018 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -42,11 +42,6 @@ class active_diagnostic_request_t;
 /// the diagnostics library to the CAN device.
 ///
 class diagnostic_manager_t {
-protected:
-       static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
-       static void shims_logger(const char* m, ...);
-       static void shims_timer();
-
 private:
        DiagnosticShims shims_; /*!< shims_ - Shim functions for each CAN bus that plug the diagnostics
                                                         * library (uds-c) into the VI's CAN peripheral.*/
@@ -56,12 +51,16 @@ private:
        std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a
                                                                                                                                           * response is received for a non-recurring request or it times out, it is removed*/
        bool initialized_; /*!< * initialized - True if the DiagnosticsManager has been initialized with shims. It will interface with the uds-c lib*/
-       utils::socketcan_bcm_t socket_; ///< rx_socket_ - a BCM socket with 8 RX_SETUP jobs for the 8 CAN ID on which ECU could respond.
+       utils::socketcan_bcm_t socket_; ///< socket_ - a BCM socket with 8 RX_SETUP jobs for the 8 CAN ID on which ECU could respond.
        struct sd_event_source* event_source_;
 
        void init_diagnostic_shims();
        void reset();
        int add_rx_filter(uint32_t can_id);
+
+       static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
+       static void shims_logger(const char* m, ...);
+       static void shims_timer();
 public:
        diagnostic_manager_t();