aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 23:59:58 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit250262eee0cfd5570298f8d69c498adc0688bdc6 (patch)
tree1c320ab6549c6508d1cf261daea530d7fba7fc92
parent20708cd497b2f77f8b97fd215b6b5c1e2886869d (diff)
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 <romain.forlot@iot.bzh>
-rw-r--r--src/can/can-message.cpp26
-rw-r--r--src/can/can-message.hpp12
-rw-r--r--src/configuration-generated.cpp4
3 files changed, 21 insertions, 21 deletions
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<CAN_MESSAGE_SIZE;i++)
@@ -124,9 +124,9 @@ bool can_message_t::is_correct_to_send()
*
* @param[in] new_format - class member
*/
-void can_message_t::set_format(const can_message_format new_format)
+void can_message_t::set_format(const can_message_format_t new_format)
{
- if(new_format == can_message_format::STANDARD || new_format == can_message_format::EXTENDED || new_format == can_message_format::ERROR)
+ if(new_format == can_message_format_t::STANDARD || new_format == can_message_format_t::EXTENDED || new_format == can_message_format_t::ERROR)
format_ = new_format;
else
ERROR(binder_interface, "ERROR: Can set format, wrong format chosen");
@@ -164,21 +164,21 @@ can_message_t can_message_t::convert_to_canfd_frame(const struct canfd_frame& fr
}
if (frame.can_id & CAN_ERR_FLAG)
- format_ = can_message_format::ERROR;
+ format_ = can_message_format_t::ERROR;
else if (frame.can_id & CAN_EFF_FLAG)
- format_ = can_message_format::EXTENDED;
+ format_ = can_message_format_t::EXTENDED;
else
- format_ = can_message_format::STANDARD;
+ format_ = can_message_format_t::STANDARD;
switch(format_)
{
- case can_message_format::STANDARD:
+ case can_message_format_t::STANDARD:
id_ = frame.can_id & CAN_SFF_MASK;
break;
- case can_message_format::EXTENDED:
+ case can_message_format_t::EXTENDED:
id_ = frame.can_id & CAN_EFF_MASK;
break;
- case can_message_format::ERROR:
+ case can_message_format_t::ERROR:
id_ = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG);
break;
default:
diff --git a/src/can/can-message.hpp b/src/can/can-message.hpp
index 0e46cc8a..bdba07ba 100644
--- a/src/can/can-message.hpp
+++ b/src/can/can-message.hpp
@@ -29,10 +29,10 @@
class can_bus_dev_t;
/**
- * @enum can_message_format
+ * @enum can_message_format_t
* @brief The ID format for a CAN message.
*/
-enum class can_message_format {
+enum class can_message_format_t {
STANDARD, /*!< STANDARD - standard 11-bit CAN arbitration ID. */
EXTENDED, /*!< EXTENDED - an extended frame, with a 29-bit arbitration ID. */
ERROR, /*!< ERROR - ERROR code used at initialization to signify that it isn't usable'*/
@@ -50,7 +50,7 @@ class can_message_t {
bool rtr_flag_; /*!< rtr_flag_ - Telling if the frame has RTR flag positionned. Then frame hasn't data field*/
uint8_t length_; /*!< length_ - the length of the data array (max 8). */
uint8_t flags_; /*!< flags_ - flags of a CAN FD frame. Needed if we catch FD frames.*/
- 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.*/
std::vector<uint8_t> 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.*/
diff --git a/src/configuration-generated.cpp b/src/configuration-generated.cpp
index 6b14adc2..6babfbea 100644
--- a/src/configuration-generated.cpp
+++ b/src/configuration-generated.cpp
@@ -15,8 +15,8 @@ std::vector<can_message_set_t> CAN_MESSAGE_SET =
std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINTION = {
{
- {0x620, can_message_format::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
- {0x442, can_message_format::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
+ {0x620, can_message_format_t::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
+ {0x442, can_message_format_t::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
},
};