From f04542587423e3b26d76c25d1c84acd5dea180b8 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 11 May 2017 01:13:15 +0200
Subject: Format
Change-Id: Idc49593fdc1a039c6a03626115e4156a629e4e65
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
CAN-binder/low-can-binding/can/can-signals.hpp | 1 -
.../diagnostic/active-diagnostic-request.cpp | 35 +++++++++++++++++-----
.../diagnostic/diagnostic-manager.hpp | 1 -
CAN-binder/low-can-binding/utils/timer.cpp | 1 -
4 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp
index 4b726c35..62fbbe7c 100644
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/CAN-binder/low-can-binding/can/can-signals.hpp
@@ -39,7 +39,6 @@ extern "C"
class can_signal_t;
class can_message_definition_t;
-
///
/// @brief The type signature for a CAN signal decoder.
///
diff --git a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
index 932edae2..2a939ed8 100644
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
@@ -52,17 +52,36 @@ active_diagnostic_request_t& active_diagnostic_request_t::operator=(const active
}
active_diagnostic_request_t::active_diagnostic_request_t()
- : bus_{nullptr}, id_{0}, handle_{nullptr}, name_{""},
- decoder_{nullptr}, callback_{nullptr}, recurring_{false}, wait_for_multiple_responses_{false},
- in_flight_{false}, frequency_clock_{frequency_clock_t()}, timeout_clock_{frequency_clock_t()}
+ : bus_{nullptr},
+ id_{0},
+ handle_{nullptr},
+ name_{""},
+ decoder_{nullptr},
+ callback_{nullptr},
+ recurring_{false},
+ wait_for_multiple_responses_{false},
+ in_flight_{false},
+ frequency_clock_{frequency_clock_t()},
+ timeout_clock_{frequency_clock_t()}
{}
active_diagnostic_request_t::active_diagnostic_request_t(const std::string& bus, DiagnosticRequest* request,
- const std::string& name, bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder,
- const DiagnosticResponseCallback callback, float frequencyHz)
- : bus_{bus}, id_{request->arbitration_id}, handle_{nullptr}, name_{name},
- decoder_{decoder}, callback_{callback}, recurring_{frequencyHz ? true : false}, wait_for_multiple_responses_{wait_for_multiple_responses},
- in_flight_{false}, frequency_clock_{frequency_clock_t(frequencyHz)}, timeout_clock_{frequency_clock_t(10)}
+ const std::string& name,
+ bool wait_for_multiple_responses,
+ const DiagnosticResponseDecoder decoder,
+ const DiagnosticResponseCallback callback,
+ float frequencyHz)
+ : bus_{bus},
+ id_{request->arbitration_id},
+ handle_{nullptr},
+ name_{name},
+ decoder_{decoder},
+ callback_{callback},
+ recurring_{frequencyHz ? true : false},
+ wait_for_multiple_responses_{wait_for_multiple_responses},
+ in_flight_{false},
+ frequency_clock_{frequency_clock_t(frequencyHz)},
+ timeout_clock_{frequency_clock_t(10)}
{}
uint32_t active_diagnostic_request_t::get_id() const
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
index 3edb2b12..a160c9c8 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -95,5 +95,4 @@ public:
openxc_VehicleMessage relay_diagnostic_handle(active_diagnostic_request_t* entry, const can_message_t& cm);
openxc_VehicleMessage find_and_decode_adr(const can_message_t& cm);
bool is_diagnostic_response(const can_message_t& cm);
-
};
diff --git a/CAN-binder/low-can-binding/utils/timer.cpp b/CAN-binder/low-can-binding/utils/timer.cpp
index 17c86659..3bc96a3a 100644
--- a/CAN-binder/low-can-binding/utils/timer.cpp
+++ b/CAN-binder/low-can-binding/utils/timer.cpp
@@ -54,7 +54,6 @@ frequency_clock_t::frequency_clock_t()
: unit_{1000000}, frequency_{10.0}, last_tick_{0}, time_function_{nullptr}
{}
-
frequency_clock_t::frequency_clock_t(float frequency)
: unit_{1000000}, frequency_{frequency}, last_tick_{0}, time_function_{nullptr}
{}
--
cgit