From 7b64216f9d8784f28b79ea7545392036f190fb6c Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 17 May 2017 17:16:30 +0200 Subject: Don't collide with application framework ERROR in some configuration. Change-Id: Idd600a47960850cd4afc553fdb79f5c57f93f64b Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/can/can-message.cpp | 12 ++++++------ CAN-binder/low-can-binding/can/can-message.hpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CAN-binder/low-can-binding/can/can-message.cpp b/CAN-binder/low-can-binding/can/can-message.cpp index 3fe2a5c..66a4f4f 100644 --- a/CAN-binder/low-can-binding/can/can-message.cpp +++ b/CAN-binder/low-can-binding/can/can-message.cpp @@ -27,7 +27,7 @@ /// Constructor about can_message_t class. /// can_message_t::can_message_t() - : maxdlen_{0}, id_{0}, length_{0}, format_{can_message_format_t::ERROR}, rtr_flag_{false}, flags_{0} + : maxdlen_{0}, id_{0}, length_{0}, format_{can_message_format_t::INVALID}, rtr_flag_{false}, flags_{0} {} can_message_t::can_message_t(uint8_t maxdlen, @@ -74,7 +74,7 @@ bool can_message_t::get_rtr_flag_() const can_message_format_t can_message_t::get_format() const { if (format_ != can_message_format_t::STANDARD || format_ != can_message_format_t::EXTENDED) - return can_message_format_t::ERROR; + return can_message_format_t::INVALID; return format_; } @@ -127,7 +127,7 @@ uint8_t can_message_t::get_length() const /// bool can_message_t::is_correct_to_send() { - if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::ERROR) + if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::INVALID) { int i; for(i=0;i