From c01da10d067038794eb845735e2a7959744ca2b3 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 8 Mar 2017 09:44:53 +0100 Subject: Added a warning that it is an example code Change-Id: Ib66e49960a348896020fba56f7d98910623af83f Signed-off-by: Romain Forlot --- src/can/can-message.hpp | 18 ++++++++++++++++++ src/can/can-signals.hpp | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) (limited to 'src/can') diff --git a/src/can/can-message.hpp b/src/can/can-message.hpp index 38a8e598..c5abd7fb 100644 --- a/src/can/can-message.hpp +++ b/src/can/can-message.hpp @@ -112,6 +112,24 @@ struct CanMessageDefinition { }; typedef struct CanMessageDefinition CanMessageDefinition; +class can_message_definition_t +{ + private: + can_bus_dev_t& bus_; /*!< bus - A pointer to the bus this message is on. */ + uint32_t id_; /*!< id - The ID of the message.*/ + CanMessageFormat format_; /*!< format - the format of the message's ID.*/ + FrequencyClock clock_; /*!< clock - an optional frequency clock to control the output of this + * message, if sent raw, or simply to mark the max frequency for custom + * handlers to retriec++ if ? syntaxve.*/ + bool forceSendChanged_; /*!< forceSendChanged - If true, regardless of the frequency, it will send CAN + * message if it has changed when using raw passthrough.*/ + uint8_t lastValue_[CAN_MESSAGE_SIZE]; /*!< lastValue - The last received value of the message. Defaults to undefined. + * This is required for the forceSendChanged functionality, as the stack + * needs to compare an incoming CAN message with the previous frame.*/ + + public: +}; + /** * @struct CanMessageSet * diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp index 17b189c6..99f62c74 100644 --- a/src/can/can-signals.hpp +++ b/src/can/can-signals.hpp @@ -122,4 +122,43 @@ struct CanSignal { }; typedef struct CanSignal CanSignal; +class can_signal_t +{ + private: + struct CanMessageDefinition* message_; /*!< message - The message this signal is a part of. */ + const std::string generic_name_; /*!< generic_name - The name of the signal to be output over USB.*/ + uint8_t bitPosition_; /*!< 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 bitSize_; /*!< bitSize - 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 + * don't need an offset. */ + float min_value_; /*!< minValue - The minimum value for the processed signal.*/ + float max_value_; /*!< maxValue - The maximum value for the processed signal. */ + FrequencyClock clock_; /*!< clock_ - A FrequencyClock struct to control the maximum frequency to + * process and send this signal. To process every value, set the + * clock's frequency to 0. */ + bool sendSame_; /*!< sendSame - If true, will re-send even if the value hasn't changed.*/ + bool forceSendChanged_; /*!< forceSendChanged - If true, regardless of the frequency, it will send the + * value if it has changed. */ + const std::map states_; /*!< states_ - A map of CAN signal state describing the mapping + * between numerical and string values for valid states. */ + uint8_t state_count_; /*!< state_count_ - The length of the states array. */ + bool writable_; /*!< writable - True if the signal is allowed to be written from the USB host + * back to CAN. Defaults to false.*/ + SignalDecoder decoder_; /*!< decoder_ - An optional function to decode a signal from the bus to a human + * readable value. If NULL, the default numerical decoder is used. */ + SignalEncoder encoder_; /*!< encoder_ - An optional function to encode a signal value to be written to + * CAN into a byte array. If NULL, the default numerical encoder + * is used. */ + bool received_; /*!< received_ - True if this signal has ever been received.*/ + float lastValue_; /*!< lastValue_ - The last received value of the signal. If 'received' is false, + * this value is undefined. */ + + public: + +}; + void find_can_signals(const openxc_DynamicField &key, std::vector& found_signals); -- cgit 1.2.3-korg