diff options
| -rw-r--r-- | src/can-message.hpp | 22 | ||||
| -rw-r--r-- | src/can-signals.hpp | 26 |
2 files changed, 21 insertions, 27 deletions
diff --git a/src/can-message.hpp b/src/can-message.hpp index f076c5c..6e51d92 100644 --- a/src/can-message.hpp +++ b/src/can-message.hpp @@ -202,4 +202,24 @@ typedef struct CanMessageDefinition CanMessageDefinition; unsigned short signalCount; /*!< signalCount - The number of CAN signals (across all messages) defined for * this message set.*/ unsigned short commandCount; /*!< commandCount - The number of CanCommmands defined for this message set.*/ -} CanMessageSet;
\ No newline at end of file +} CanMessageSet; + +/** Public: Return the currently active CAN configuration. */ +CanMessageSet* getActiveMessageSet(); + +/** Public: Retrive a list of all possible CAN configurations. + * + * Returns a pointer to an array of all configurations. + */ +CanMessageSet* getMessageSets(); + +/** Public: Return the length of the array returned by getMessageSets() */ +int getMessageSetCount(); + +/* Public: Return an array of all CAN messages to be processed in the active + * configuration. + */ +CanMessageDefinition* getMessages(); + +/* Public: Return the length of the array returned by getMessages(). */ +int getMessageCount();
\ No newline at end of file diff --git a/src/can-signals.hpp b/src/can-signals.hpp index 92dfe72..a6248f2 100644 --- a/src/can-signals.hpp +++ b/src/can-signals.hpp @@ -133,29 +133,6 @@ struct CanSignal { }; typedef struct CanSignal CanSignal; -/** Public: Return the currently active CAN configuration. */ -CanMessageSet* getActiveMessageSet(); - -/** Public: Retrive a list of all possible CAN configurations. - * - * Returns a pointer to an array of all configurations. - */ -CanMessageSet* getMessageSets(); - -/** Public: Return the length of the array returned by getMessageSets() */ -int getMessageSetCount(); - -/* Public: Return the number of CAN buses configured in the active - * configuration. This is limited to 2, as the hardware controller only has 2 - * CAN channels. - */ -int getCanBusCount(); - -/* Public: Return an array of all CAN messages to be processed in the active - * configuration. - */ -CanMessageDefinition* getMessages(); - /* Public: Return signals from an signals array filtered on name. */ const std::vector<CanSignal> getSignals(); @@ -163,9 +140,6 @@ const std::vector<CanSignal> getSignals(); /* Public: Return the length of the array returned by getSignals(). */ size_t getSignalCount(); -/* Public: Return the length of the array returned by getMessages(). */ -int getMessageCount(); - /** * @brief Find one or many signals based on its name or id * passed through openxc_DynamicField. |