From e2af4a871c6a8bcab4733193948833aed9c5ceb8 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 17 Jul 2017 10:59:10 +0200 Subject: Format Change-Id: I036befbfb38b01d046d35a1364c28e0835dcbd41 Signed-off-by: Romain Forlot --- low-can-binding/diagnostic/active-diagnostic-request.cpp | 4 ++-- low-can-binding/diagnostic/active-diagnostic-request.hpp | 2 +- low-can-binding/diagnostic/diagnostic-manager.cpp | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'low-can-binding/diagnostic') diff --git a/low-can-binding/diagnostic/active-diagnostic-request.cpp b/low-can-binding/diagnostic/active-diagnostic-request.cpp index 1ccb2e74..71f5980d 100644 --- a/low-can-binding/diagnostic/active-diagnostic-request.cpp +++ b/low-can-binding/diagnostic/active-diagnostic-request.cpp @@ -41,13 +41,13 @@ active_diagnostic_request_t& active_diagnostic_request_t::operator=(const active name_ = adr.name_; decoder_ = adr.decoder_; callback_ = adr.callback_; - recurring_ = adr.recurring_; + recurring_ = adr.recurring_; wait_for_multiple_responses_ = adr.wait_for_multiple_responses_; frequency_clock_ = adr.frequency_clock_; timeout_clock_ = adr.timeout_clock_; socket_ = adr.socket_; } - + return *this; } diff --git a/low-can-binding/diagnostic/active-diagnostic-request.hpp b/low-can-binding/diagnostic/active-diagnostic-request.hpp index ff503d8a..36f9e43c 100644 --- a/low-can-binding/diagnostic/active-diagnostic-request.hpp +++ b/low-can-binding/diagnostic/active-diagnostic-request.hpp @@ -67,7 +67,7 @@ private: DiagnosticRequestHandle* handle_; ///< handle_ - A handle for the request to keep track of it between ///< sending the frames of the request and receiving all frames of the response. std::string name_; ///< name_ - Human readable name, to be used when publishing received responses. - static std::string prefix_; ///< prefix_ - It has to reflect the JSON object which it comes from. It makes easier sorting + static std::string prefix_; ///< prefix_ - It has to reflect the JSON object which it comes from. It makes easier sorting ///< incoming CAN messages. DiagnosticResponseDecoder decoder_; ///< decoder_ - An optional DiagnosticResponseDecoder to parse the payload of responses ///< to this request. If the decoder is NULL, the output will include the raw payload diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp index 89303f1a..8533503f 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -41,7 +41,7 @@ diagnostic_manager_t::diagnostic_manager_t() /// to have 1 diagnostic bus which are the first bus declared in the JSON /// description file. Configuration instance will return it. /// -/// this will initialize DiagnosticShims and cancel all active requests +/// this will initialize DiagnosticShims and cancel all active requests /// if there are any. bool diagnostic_manager_t::initialize() { @@ -80,7 +80,7 @@ void diagnostic_manager_t::reset() /// @param[in] data - The data payload for the message. NULL is valid if size is also 0. /// @param[in] size - The size of the data payload, in bytes. /// -/// @return true if the CAN message was sent successfully. +/// @return true if the CAN message was sent successfully. bool diagnostic_manager_t::shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size) { diagnostic_manager_t& dm = application_t::instance().get_diagnostic_manager(); @@ -185,7 +185,7 @@ void diagnostic_manager_t::cancel_request(active_diagnostic_request_t* entry) } /// @brief Cleanup a specific request if it isn't running and get complete. As it is almost -/// impossible to get that state for a recurring request without waiting for that, you can +/// impossible to get that state for a recurring request without waiting for that, you can /// force the cleaning operation. /// /// @param[in] entry - the request to clean @@ -373,7 +373,7 @@ active_diagnostic_request_t* diagnostic_manager_t::add_recurring_request(Diagnos recurring_requests_.push_back(entry); entry->set_handle(shims_, request); - start_diagnostic_request(&shims_, entry->get_handle()); + start_diagnostic_request(&shims_, entry->get_handle()); } else { @@ -440,7 +440,7 @@ openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_response(active_dia } /// @brief Will take the CAN message and pass it to the receive functions that will process -/// diagnostic handle for each active diagnostic request then depending on the result we will +/// diagnostic handle for each active diagnostic request then depending on the result we will /// return pass the diagnostic response to decode it. /// /// @param[in] entry - A pointer to an active diagnostic request holding a valid diagnostic handle @@ -494,7 +494,7 @@ openxc_VehicleMessage diagnostic_manager_t::find_and_decode_adr(const can_messag } /// @brief Tell if the CAN message received is a diagnostic response. -/// Request broadcast ID use 0x7DF and assigned ID goes from 0x7E0 to Ox7E7. That allows up to 8 ECU to respond +/// Request broadcast ID use 0x7DF and assigned ID goes from 0x7E0 to Ox7E7. That allows up to 8 ECU to respond /// at the same time. The response is the assigned ID + 0x8, so response ID can goes from 0x7E8 to 0x7EF. /// /// @param[in] cm - CAN message received from the socket. -- cgit 1.2.3-korg