aboutsummaryrefslogtreecommitdiffstats
path: root/CAN-binder/low-can-binding/can/can-signals.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-05 18:34:48 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-05 18:42:30 +0200
commit5b66a43147af37f4ebe3429eb045900aa7323613 (patch)
tree0262af2114e8a043fc3660da54b3806c55c33d45 /CAN-binder/low-can-binding/can/can-signals.hpp
parentae74dbcb89f3d471b66e1f1d2fe4bdf33cfff388 (diff)
Improve granularity of BCM socket using one by signal
Move create_rx_filter to can_signals and adding all accessories needed to works. Change-Id: I3636fe82ce5c2e43a4992b66ce89440ff709004a Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/can/can-signals.hpp')
-rw-r--r--CAN-binder/low-can-binding/can/can-signals.hpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp
index 50eb4ec5..f21cab49 100644
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/CAN-binder/low-can-binding/can/can-signals.hpp
@@ -25,6 +25,7 @@
#include "openxc.pb.h"
#include "../utils/timer.hpp"
+#include "../utils/socketcan-bcm.hpp"
#include "can-message.hpp"
#include "can-message-definition.hpp"
#include "../diagnostic/diagnostic-message.hpp"
@@ -75,15 +76,16 @@ typedef uint64_t (*SignalEncoder)(can_signal_t* signal,
class can_signal_t
{
private:
- std::uint8_t message_set_id_;
- std::uint8_t message_id_;
+ utils::socketcan_bcm_t socket_; /*!< socket_ - Specific BCM socket that filter the signal read from CAN device */
+ std::uint8_t message_set_id_; ///< message_set_id_ - Index number to the message_set_id container object
+ std::uint8_t message_id_; ///< message_id_ - Index number to the message_definition_t container object
std::string generic_name_; /*!< generic_name_ - The name of the signal to be output.*/
static std::string prefix_; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol.
* which make easier to sort message when the come in.*/
uint8_t bit_position_; /*!< bitPosition_ - The starting bit of the signal in its CAN message (assuming
* non-inverted bit numbering, i.e. the most significant bit of
* each byte is 0) */
- uint8_t bit_size_; /*!< bitSize_ - The width of the bit field in the CAN message. */
+ uint8_t bit_size_; /*!< bit_size_ - The width of the bit field in the CAN message. */
float factor_; /*!< factor_ - The final value will be multiplied by this factor. Use 1 if you
* don't need a factor. */
float offset_; /*!< offset_ - The final value will be added to this offset. Use 0 if you
@@ -129,6 +131,7 @@ public:
SignalEncoder encoder,
bool received);
+ utils::socketcan_bcm_t get_socket() const;
const can_message_definition_t& get_message() const;
const std::string& get_generic_name() const;
const std::string get_name() const;
@@ -154,4 +157,5 @@ public:
void set_prefix(std::string val);
void set_received(bool r);
void set_last_value(float val);
+ int create_rx_filter();
}; \ No newline at end of file