Format
authorRomain Forlot <romain.forlot@iot.bzh>
Wed, 10 May 2017 23:13:15 +0000 (01:13 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Fri, 19 May 2017 09:36:42 +0000 (11:36 +0200)
Change-Id: Idc49593fdc1a039c6a03626115e4156a629e4e65
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
CAN-binder/low-can-binding/can/can-signals.hpp
CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
CAN-binder/low-can-binding/utils/timer.cpp

index 4b726c3..62fbbe7 100644 (file)
@@ -39,7 +39,6 @@ extern "C"
 
 class can_signal_t;
 class can_message_definition_t;
-
 ///
 /// @brief The type signature for a CAN signal decoder.
 ///
index 932edae..2a939ed 100644 (file)
@@ -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
index 3edb2b1..a160c9c 100644 (file)
@@ -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);
-
 };
index 17c8665..3bc96a3 100644 (file)
@@ -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}
 {}