aboutsummaryrefslogtreecommitdiffstats
path: root/src/can/can-bus-dev.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-09 10:42:20 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit5ad1fd6926254db46621e252d0da6dc5ec95c390 (patch)
tree13d41b8f4e2764609f8f88761c24960718c70dda /src/can/can-bus-dev.hpp
parent3b55101caf70e27cb312f3f7235ed4b30ff6d849 (diff)
Fix: bugs in class due to the wrapping of C socket
into a class. Added missing include and adjust methods signature. Change-Id: Id016b452e0b641a14482c288e4713acae941ee1d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can/can-bus-dev.hpp')
-rw-r--r--src/can/can-bus-dev.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/can/can-bus-dev.hpp b/src/can/can-bus-dev.hpp
index 59d999f1..744f53fa 100644
--- a/src/can/can-bus-dev.hpp
+++ b/src/can/can-bus-dev.hpp
@@ -18,6 +18,7 @@
#pragma once
+#include <stdint.h>
#include <string>
#include <thread>
#include <linux/can.h>
@@ -54,8 +55,8 @@ public:
void stop_reading();
- std::pair<struct canfd_frame&, size_t> read();
+ can_message_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);
+ static bool send_can_message(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
};