Added a static method to get used by Diagnostic manager
authorRomain Forlot <romain.forlot@iot.bzh>
Thu, 9 Mar 2017 01:26:48 +0000 (02:26 +0100)
committerRomain Forlot <romain.forlot@iot.bzh>
Thu, 16 Mar 2017 16:10:40 +0000 (17:10 +0100)
that respect the requested signature.

Change-Id: Id10215597d65ecaf280fe6252d78bc74a306958e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
src/can/can-bus-dev.cpp
src/can/can-bus-dev.hpp

index 389154b..f459567 100644 (file)
@@ -193,3 +193,34 @@ int can_bus_dev_t::send_can_message(can_message_t& can_msg)
        }
        return 0;
 }
+
+/// @brief Send a can message from a can_message_t object.
+/// @param[in] can bus used to send the message
+/// @param[in] can_msg the can message object to send
+bool can_bus_dev_t::send_can_message(const uint16_t arbitration_id, const uint8_t* data, const uint8_t size)
+{
+       ssize_t nbytes;
+       canfd_frame f;
+
+       f.can_id = arbitration_id;
+       f.len = size;
+       ::memcpy(f.data, data, size);
+
+       if(socket.socket())
+       {
+               nbytes = ::sendto(socket.socket(), &f, sizeof(struct canfd_frame), 0,
+                       (struct sockaddr*)&txAddress_, sizeof(txAddress_));
+               if (nbytes == -1)
+               {
+                       ERROR(binder_interface, "send_can_message: Sending CAN frame failed.");
+                       return -1;
+               }
+               return (int)nbytes;
+       }
+       else
+       {
+               ERROR(binder_interface, "send_can_message: socket not initialized. Attempt to reopen can device socket.");
+               open();
+       }
+       return 0;
+}
index d7c3458..59d999f 100644 (file)
@@ -57,4 +57,5 @@ public:
        std::pair<struct canfd_frame&, size_t> read();
 
        int send_can_message(can_message_t& can_msg);
+       static bool send_can_message(const uint16_t arbitration_id, const uint8_t* data, const uint8_t size);
 };