From fbd0fb6d5f38f7a12f3bebb4a7fb14bd3e6bfb7c Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Thu, 16 Mar 2017 09:54:02 +0100
Subject: wip: generation of a configuration for can_signaling.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I35b31a98e87943a4e2fcad06561fec7a347b8483
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 src/openxc/can_message.hpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/openxc/can_message.hpp')

diff --git a/src/openxc/can_message.hpp b/src/openxc/can_message.hpp
index 57bd23f..3f7b018 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);
 }
-- 
cgit 1.2.3-korg