Fix: wrong include relative path.

[apps/agl-service-can-low-level.git] / CAN-binder / low-can-binding / can / can-bus-dev.cpp

diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.cpp b/CAN-binder/low-can-binding/can/can-bus-dev.cpp
index 4737d11..07f921f 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus-dev.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus-dev.cpp
@@ -21,13 +21,12 @@
 #include <unistd.h>
 #include <linux/can/raw.h>
 #include <linux/can/bcm.h>
-#include <cmath>
 
 #include "can-bus.hpp"
 #include "can-message.hpp"
 #include "../low-can-binding.hpp"
 #include "canutil/write.h"
-#include "../bitfield/bitfield.h"
+#include "bitfield/bitfield.h"
 
 /// @brief Class constructor
 ///
@@ -126,13 +125,13 @@ int can_bus_dev_t::create_rx_filter(const can_signal_t& s)
 {
        uint32_t can_id  = s.get_message().get_id();
 
-       struct utils::basic_bcm_msg<struct can_frame> bcm_msg;
+       struct utils::simple_bcm_msg bcm_msg;
        struct can_frame cfd;
 
        memset(&cfd, 0, sizeof(cfd));
        memset(&bcm_msg.msg_head, 0, sizeof(bcm_msg.msg_head));
        uint8_t bit_size = s.get_bit_size();
-       float val = (float)exp2(bit_size)-1;
+       float val = (float)(1 << bit_size)-1;
 
        bcm_msg.msg_head.opcode  = RX_SETUP;
        bcm_msg.msg_head.can_id  = can_id;
@@ -146,7 +145,7 @@ int can_bus_dev_t::create_rx_filter(const can_signal_t& s)
                                                                                cfd.data,
                                                                                CAN_MAX_DLEN);
 
-       bcm_msg.frames.push_back(cfd);
+       bcm_msg.frames = cfd;
 
        if(can_socket_ << bcm_msg)
                return 0;