From 250262eee0cfd5570298f8d69c498adc0688bdc6 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 8 Mar 2017 23:59:58 +0100 Subject: Again change enum name and add "_t" suffix to get syntax coloration into IDE... Neat, isn't it ! Change-Id: Ieee2618336be80ddf97ccaa29bc83098a6463c56 Signed-off-by: Romain Forlot --- src/can/can-message.cpp | 26 +++++++++++++------------- src/can/can-message.hpp | 12 ++++++------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/can') diff --git a/src/can/can-message.cpp b/src/can/can-message.cpp index 3dc80dcc..1be0d2d4 100644 --- a/src/can/can-message.cpp +++ b/src/can/can-message.cpp @@ -32,7 +32,7 @@ * Constructor about can_message_t class. */ can_message_t::can_message_t() - : id_{0}, rtr_flag_{false}, length_{0}, flags_{0}, format_{can_message_format::ERROR}, maxdlen_{0} + : id_{0}, rtr_flag_{false}, length_{0}, flags_{0}, format_{can_message_format_t::ERROR}, maxdlen_{0} {} /** @@ -60,10 +60,10 @@ bool can_message_t::get_rtr_flag_() const * * @return format_ class member */ -int can_message_t::get_format() const +can_message_format_t can_message_t::get_format() const { - if (format_ != can_message_format::STANDARD || format_ != can_message_format::EXTENDED) - return can_message_format::ERROR; + if (format_ != can_message_format_t::STANDARD || format_ != can_message_format_t::EXTENDED) + return can_message_format_t::ERROR; return format_; } @@ -106,7 +106,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::ERROR) + if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::ERROR) { int i; for(i=0;i data_; /*!< data_ - The message's data field with a size of 8 which is the standard about CAN bus messages.*/ uint8_t maxdlen_; /*!< maxdlen_ - Max data length deduce from number of bytes read from the socket.*/ @@ -60,12 +60,12 @@ class can_message_t { uint32_t get_id() const; bool get_rtr_flag_() const; - int get_format() const; + can_message_format_t get_format() const; uint8_t get_flags() const; const uint8_t* get_data() const; uint8_t get_length() const; - void set_format(const can_message_format new_format); + void set_format(const can_message_format_t new_format); bool is_correct_to_send(); @@ -85,7 +85,7 @@ class can_message_definition_t private: can_bus_dev_t& bus_; /*!< bus_ - A pointer to the bus this message is on. */ uint32_t id_; /*!< id_ - The ID of the message.*/ - can_message_format format_; /*!< format_ - the format of the message's ID.*/ + can_message_format_t format_; /*!< format_ - the format of the message's ID.*/ FrequencyClock clock_; /*!< clock_ - an optional frequency clock to control the output of this * message, if sent raw, or simply to mark the max frequency for custom * handlers to retrieve.*/ -- cgit 1.2.3-korg