diff options
Diffstat (limited to 'src/openxc/can_message.hpp')
| -rwxr-xr-x | src/openxc/can_message.hpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/openxc/can_message.hpp b/src/openxc/can_message.hpp index 57bd23fd..3f7b0181 100755 --- a/src/openxc/can_message.hpp +++ b/src/openxc/can_message.hpp @@ -2,7 +2,6 @@ #include <string>
#include <vector>
-#include <map>
#include <json.hpp>
#include "signal.hpp"
@@ -12,26 +11,29 @@ namespace openxc class can_message
{
private:
+ std::string id_;
std::string bus_;
bool bit_numbering_inverted_;
- std::map<std::string, signal> signals_;
+ std::vector<signal> signals_;
std::string name_;
std::vector<std::string> handlers_;
bool enabled_;
- std::uint32_t max_frequency_;
- std::uint32_t max_signal_frequency_;
+ float max_frequency_;
+ float max_signal_frequency_;
bool force_send_changed_;
bool force_send_changed_signals_;
public:
+ std::string id() const;
+ void id(const std::string& id);
std::string bus() const;
bool bit_numbering_inverted() const;
- const std::map<std::string, signal>& signals() const;
+ const std::vector<signal>& signals() const;
std::string name() const;
std::vector<std::string> handlers() const;
bool enabled() const;
- std::uint32_t max_frequency() const;
- std::uint32_t max_signal_frequency() const;
+ float max_frequency() const;
+ float max_signal_frequency() const;
bool force_send_changed() const;
bool force_send_changed_signals() const;
@@ -43,4 +45,5 @@ namespace openxc void to_json(nlohmann::json& j, const can_message& p);
void from_json(const nlohmann::json& j, can_message& p);
+ void from_json(const nlohmann::json& j, can_message& p, const std::string& id);
}
|