aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 23:29:08 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit027cf3d6f3672911f74c3d4eb18f65adc31732fc (patch)
tree8a9ce4387715f9267219de6f72e54c8f8c765988
parent6546d8b0438b7f483b43ed35c957c979723305bf (diff)
Change CanMessageFormat name to make it
as the other type. Change-Id: I4b3ae3998175613458492a0f02cce06a576cbfa8 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--src/can/can-message.cpp24
-rw-r--r--src/can/can-message.hpp10
-rw-r--r--src/configuration-generated.cpp4
3 files changed, 19 insertions, 19 deletions
diff --git a/src/can/can-message.cpp b/src/can/can-message.cpp
index 5409373c..3dc80dcc 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_{CanMessageFormat::ERROR}, maxdlen_{0}
+ : id_{0}, rtr_flag_{false}, length_{0}, flags_{0}, format_{can_message_format::ERROR}, maxdlen_{0}
{}
/**
@@ -62,8 +62,8 @@ bool can_message_t::get_rtr_flag_() const
*/
int can_message_t::get_format() const
{
- if (format_ != CanMessageFormat::STANDARD || format_ != CanMessageFormat::EXTENDED)
- return CanMessageFormat::ERROR;
+ if (format_ != can_message_format::STANDARD || format_ != can_message_format::EXTENDED)
+ return can_message_format::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_ != CanMessageFormat::ERROR)
+ if (id_ != 0 && length_ != 0 && format_ != can_message_format::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 CanMessageFormat new_format)
+void can_message_t::set_format(const can_message_format new_format)
{
- if(new_format == CanMessageFormat::STANDARD || new_format == CanMessageFormat::EXTENDED || new_format == CanMessageFormat::ERROR)
+ if(new_format == can_message_format::STANDARD || new_format == can_message_format::EXTENDED || new_format == can_message_format::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_ = CanMessageFormat::ERROR;
+ format_ = can_message_format::ERROR;
else if (frame.can_id & CAN_EFF_FLAG)
- format_ = CanMessageFormat::EXTENDED;
+ format_ = can_message_format::EXTENDED;
else
- format_ = CanMessageFormat::STANDARD;
+ format_ = can_message_format::STANDARD;
switch(format_)
{
- case CanMessageFormat::STANDARD:
+ case can_message_format::STANDARD:
id_ = frame.can_id & CAN_SFF_MASK;
break;
- case CanMessageFormat::EXTENDED:
+ case can_message_format::EXTENDED:
id_ = frame.can_id & CAN_EFF_MASK;
break;
- case CanMessageFormat::ERROR:
+ case can_message_format::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 a4581261..6736a9bf 100644
--- a/src/can/can-message.hpp
+++ b/src/can/can-message.hpp
@@ -28,10 +28,10 @@
#define CAN_MESSAGE_SIZE 8
/**
- * @enum CanMessageFormat
+ * @enum can_message_format
* @brief The ID format for a CAN message.
*/
-class enum CanMessageFormat {
+enum class can_message_format {
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'*/
@@ -49,7 +49,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.*/
- CanMessageFormat format_; /*!< format_ - the format of the message's ID.*/
+ can_message_format 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.*/
@@ -64,7 +64,7 @@ class can_message_t {
const uint8_t* get_data() const;
uint8_t get_length() const;
- void set_format(const CanMessageFormat new_format);
+ void set_format(const can_message_format new_format);
bool is_correct_to_send();
@@ -84,7 +84,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.*/
- CanMessageFormat format_; /*!< format_ - the format of the message's ID.*/
+ can_message_format 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 9e437949..e2939f90 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, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
- {0x442, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
+ {0x620, can_message_format::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
+ {0x442, can_message_format::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
},
};