X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-bus-dev.cpp;h=07f921f2758a9e1f64d31e47c4f4a5e621ead622;hb=10e7cf8b0d84be658069f60e5dd4831ec202cd70;hp=4737d113ebf65ba6d2977642d0411475f638d551;hpb=abd0190c2ba3a624272ed1f6a3a9c8fe8c4dd140;p=apps%2Fagl-service-can-low-level.git 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 4737d113..07f921f2 100644 --- 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 #include #include -#include #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 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;