diff options
Diffstat (limited to 'CAN-binder/low-can-binding/diagnostic')
| -rw-r--r-- | CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp index cfabfeaf..61aa699d 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -52,7 +52,7 @@ bool diagnostic_manager_t::initialize() reset(); initialized_ = true; - DEBUG(binder_interface, "%s: Diagnostic Manager initialized", __FUNCTION__); + DEBUG("Diagnostic Manager initialized"); return initialized_; } @@ -62,13 +62,13 @@ bool diagnostic_manager_t::initialize() void diagnostic_manager_t::init_diagnostic_shims() { shims_ = diagnostic_init_shims(shims_logger, shims_send, NULL); - DEBUG(binder_interface, "%s: Shims initialized", __FUNCTION__); + DEBUG("Shims initialized"); } /// @brief Force cleanup all active requests. void diagnostic_manager_t::reset() { - DEBUG(binder_interface, "%s: Clearing existing diagnostic requests", __FUNCTION__); + DEBUG("Clearing existing diagnostic requests"); cleanup_active_requests(true); } @@ -132,7 +132,7 @@ void diagnostic_manager_t::shims_logger(const char* format, ...) char buffer[256]; vsnprintf(buffer, 256, format, args); - DEBUG(binder_interface, "%s: %s", __FUNCTION__, buffer); + DEBUG("%s", buffer); va_end(args); } @@ -201,11 +201,11 @@ void diagnostic_manager_t::cleanup_request(active_diagnostic_request_t* entry, b { cancel_request(entry); find_and_erase(entry, recurring_requests_); - DEBUG(binder_interface, "%s: Cancelling completed, recurring request: %s", __FUNCTION__, request_string); + DEBUG("Cancelling completed, recurring request: %s", request_string); } else if (!entry->get_recurring()) { - DEBUG(binder_interface, "%s: Cancelling completed, non-recurring request: %s", __FUNCTION__, request_string); + DEBUG("Cancelling completed, non-recurring request: %s", request_string); cancel_request(entry); find_and_erase(entry, non_recurring_requests_); } @@ -297,14 +297,14 @@ active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest // Erase any existing request not already cleaned. cleanup_request(entry, true); - DEBUG(binder_interface, "%s: Added one-time diagnostic request on bus %s: %s", __FUNCTION__, + DEBUG("Added one-time diagnostic request on bus %s: %s", bus_.c_str(), request_string); non_recurring_requests_.push_back(entry); } else { - WARNING(binder_interface, "%s: There isn't enough request entry. Vector exhausted %d/%d", __FUNCTION__, (int)non_recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS); + WARNING("There isn't enough request entry. Vector exhausted %d/%d", (int)non_recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS); non_recurring_requests_.resize(MAX_SIMULTANEOUS_DIAG_REQUESTS); } return entry; @@ -319,7 +319,7 @@ active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest bool diagnostic_manager_t::validate_optional_request_attributes(float frequencyHz) { if(frequencyHz > MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ) { - DEBUG(binder_interface, "%s: Requested recurring diagnostic frequency %lf is higher than maximum of %d", __FUNCTION__, + DEBUG("Requested recurring diagnostic frequency %lf is higher than maximum of %d", frequencyHz, MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ); return false; } @@ -377,12 +377,12 @@ active_diagnostic_request_t* diagnostic_manager_t::add_recurring_request(Diagnos } else { - WARNING(binder_interface, "%s: There isn't enough request entry. Vector exhausted %d/%d", __FUNCTION__, (int)recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS); + WARNING("There isn't enough request entry. Vector exhausted %d/%d", (int)recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS); recurring_requests_.resize(MAX_SIMULTANEOUS_DIAG_REQUESTS); } } else - { DEBUG(binder_interface, "%s: Can't add request, one already exists with same key", __FUNCTION__);} + { DEBUG("Can't add request, one already exists with same key");} return entry; } @@ -425,7 +425,7 @@ openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_response(active_dia found_signals = utils::signals_manager_t::instance().find_signals(build_DynamicField(adr->get_name())); found_signals.diagnostic_messages.front()->set_supported(false); cleanup_request(adr, true); - NOTICE(binder_interface, "%s: PID not supported or ill formed. Please unsubscribe from it. Error code : %d", __FUNCTION__, response.negative_response_code); + NOTICE("PID not supported or ill formed. Please unsubscribe from it. Error code : %d", response.negative_response_code); message = build_VehicleMessage(build_SimpleMessage(adr->get_name(), build_DynamicField("This PID isn't supported by your vehicle."))); } |