diff options
Diffstat (limited to 'low-can-binding/diagnostic')
| -rw-r--r-- | low-can-binding/diagnostic/active-diagnostic-request.cpp | 4 | ||||
| -rw-r--r-- | low-can-binding/diagnostic/diagnostic-manager.cpp | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/low-can-binding/diagnostic/active-diagnostic-request.cpp b/low-can-binding/diagnostic/active-diagnostic-request.cpp index f503e0a5..1ccb2e74 100644 --- a/low-can-binding/diagnostic/active-diagnostic-request.cpp +++ b/low-can-binding/diagnostic/active-diagnostic-request.cpp @@ -22,7 +22,7 @@ #include "../binding/application.hpp" -#define ERROR_PID 0xFF +#define AFB_ERROR_PID 0xFF std::string active_diagnostic_request_t::prefix_ = "diagnostic_messages"; @@ -100,7 +100,7 @@ uint16_t active_diagnostic_request_t::get_pid() const { if (handle_->request.has_pid) return handle_->request.pid; - return ERROR_PID; + return AFB_ERROR_PID; } DiagnosticRequestHandle* active_diagnostic_request_t::get_handle() diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp index 61aa699d..89303f1a 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -52,7 +52,7 @@ bool diagnostic_manager_t::initialize() reset(); initialized_ = true; - DEBUG("Diagnostic Manager initialized"); + AFB_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("Shims initialized"); + AFB_DEBUG("Shims initialized"); } /// @brief Force cleanup all active requests. void diagnostic_manager_t::reset() { - DEBUG("Clearing existing diagnostic requests"); + AFB_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("%s", buffer); + AFB_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("Cancelling completed, recurring request: %s", request_string); + AFB_DEBUG("Cancelling completed, recurring request: %s", request_string); } else if (!entry->get_recurring()) { - DEBUG("Cancelling completed, non-recurring request: %s", request_string); + AFB_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("Added one-time diagnostic request on bus %s: %s", + AFB_DEBUG("Added one-time diagnostic request on bus %s: %s", bus_.c_str(), request_string); non_recurring_requests_.push_back(entry); } else { - WARNING("There isn't enough request entry. Vector exhausted %d/%d", (int)non_recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS); + AFB_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("Requested recurring diagnostic frequency %lf is higher than maximum of %d", + AFB_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("There isn't enough request entry. Vector exhausted %d/%d", (int)recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS); + AFB_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("Can't add request, one already exists with same key");} + { AFB_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("PID not supported or ill formed. Please unsubscribe from it. Error code : %d", response.negative_response_code); + AFB_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."))); } |