From 32e25cbca210a359b09768537b6f443fe90a3070 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 20 Jun 2017 10:24:05 +0000
Subject: Separation Generator to a dedicated repo

Change-Id: Id94831651c3266861435272a6e36c7884bef2c45
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 CAN-config-generator/src/openxc/can_bus.cpp        |  89 -------------
 CAN-config-generator/src/openxc/can_bus.hpp        |  42 ------
 CAN-config-generator/src/openxc/can_message.cpp    | 126 ------------------
 CAN-config-generator/src/openxc/can_message.hpp    |  49 -------
 CAN-config-generator/src/openxc/command.cpp        |  45 -------
 CAN-config-generator/src/openxc/command.hpp        |  25 ----
 .../src/openxc/diagnostic_message.cpp              |  80 ------------
 .../src/openxc/diagnostic_message.hpp              |  35 -----
 CAN-config-generator/src/openxc/mapping.cpp        |  59 ---------
 CAN-config-generator/src/openxc/mapping.hpp        |  29 -----
 CAN-config-generator/src/openxc/message_set.cpp    | 145 ---------------------
 CAN-config-generator/src/openxc/message_set.hpp    |  59 ---------
 CAN-config-generator/src/openxc/signal.cpp         | 142 --------------------
 CAN-config-generator/src/openxc/signal.hpp         |  53 --------
 14 files changed, 978 deletions(-)
 delete mode 100755 CAN-config-generator/src/openxc/can_bus.cpp
 delete mode 100755 CAN-config-generator/src/openxc/can_bus.hpp
 delete mode 100755 CAN-config-generator/src/openxc/can_message.cpp
 delete mode 100755 CAN-config-generator/src/openxc/can_message.hpp
 delete mode 100755 CAN-config-generator/src/openxc/command.cpp
 delete mode 100755 CAN-config-generator/src/openxc/command.hpp
 delete mode 100755 CAN-config-generator/src/openxc/diagnostic_message.cpp
 delete mode 100755 CAN-config-generator/src/openxc/diagnostic_message.hpp
 delete mode 100755 CAN-config-generator/src/openxc/mapping.cpp
 delete mode 100755 CAN-config-generator/src/openxc/mapping.hpp
 delete mode 100755 CAN-config-generator/src/openxc/message_set.cpp
 delete mode 100755 CAN-config-generator/src/openxc/message_set.hpp
 delete mode 100755 CAN-config-generator/src/openxc/signal.cpp
 delete mode 100755 CAN-config-generator/src/openxc/signal.hpp

(limited to 'CAN-config-generator/src/openxc')

diff --git a/CAN-config-generator/src/openxc/can_bus.cpp b/CAN-config-generator/src/openxc/can_bus.cpp
deleted file mode 100755
index 0a968a9e..00000000
--- a/CAN-config-generator/src/openxc/can_bus.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "can_bus.hpp"
-
-namespace openxc
-{
-	std::uint32_t can_bus::controller() const
-	{
-		return controller_;
-	}
-	
-	std::uint32_t can_bus::speed() const
-	{
-		return speed_;
-	}
-	
-	can_bus_mode can_bus::raw_can_mode() const
-	{
-		return raw_can_mode_;
-	}
-	
-	bool can_bus::raw_writable() const
-	{
-		return raw_writable_;
-	}
-	
-	float can_bus::max_message_frequency() const
-	{
-		return max_message_frequency_;
-	}
-	
-	bool can_bus::force_send_changed() const
-	{
-		return force_send_changed_;
-	}
-	
-	void can_bus::from_json(const nlohmann::json& j)
-	{
-		controller_ = j.count("controller") ? j["controller"].get<std::uint32_t>() : 1;
-		speed_ = j.count("speed") ? j["speed"].get<std::uint32_t>() : 0;
-		raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;
-		raw_writable_ = j.count("raw_writable") ? j["raw_writable"].get<bool>() : false;
-		max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<float>() : 0;
-		force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : false;
-	}
-
-	nlohmann::json can_bus::to_json() const
-	{
-		nlohmann::json j;
-		j["controller"] = controller_;
-		j["speed"] = speed_;
-		j["raw_can_mode"] = raw_can_mode_;
-		j["raw_writable"] = raw_writable_;
-		j["max_message_frequency"] = max_message_frequency_;
-		j["force_send_changed"] = force_send_changed_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const can_bus& p)
-	{
-		j = p.to_json();
-	}
-
-	void from_json(const nlohmann::json& j, can_bus& p)
-	{
-		p.from_json(j);
-	}
-
-	void to_json(nlohmann::json& j, const can_bus_mode& p)
-	{
-		switch (p)
-		{
-		case can_bus_mode::off:
-			j = std::string("off");
-			break;
-		case can_bus_mode::filtered:
-			j = std::string("filtered");
-			break;
-		case can_bus_mode::unfiltered:
-			j = std::string("unfiltered");
-			break;
-		}
-	}
-
-	void from_json(const nlohmann::json& j, can_bus_mode& p)
-	{
-		if (j.get<std::string>() == "off") p = can_bus_mode::off;
-		else if (j.get<std::string>() == "filtered") p = can_bus_mode::filtered;
-		else p = can_bus_mode::unfiltered;
-	}
-}
diff --git a/CAN-config-generator/src/openxc/can_bus.hpp b/CAN-config-generator/src/openxc/can_bus.hpp
deleted file mode 100755
index 74e1273f..00000000
--- a/CAN-config-generator/src/openxc/can_bus.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <json.hpp>
-
-namespace openxc
-{
-	enum class can_bus_mode
-	{
-		off,
-		filtered,
-		unfiltered
-	};
-
-	class can_bus
-	{
-	private:
-		std::uint32_t	controller_;
-		std::uint32_t	speed_;
-		can_bus_mode	raw_can_mode_;
-		bool			raw_writable_;
-		float			max_message_frequency_;
-		bool			force_send_changed_;
-
-	public:
-		std::uint32_t controller() const;
-		std::uint32_t speed() const;
-		can_bus_mode raw_can_mode() const;
-		bool raw_writable() const;
-		float max_message_frequency() const;
-		bool force_send_changed() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-	};
-
-	void to_json(nlohmann::json& j, const can_bus& p);
-	void from_json(const nlohmann::json& j, can_bus& p);
-
-	void to_json(nlohmann::json& j, const can_bus_mode& p);
-	void from_json(const nlohmann::json& j, can_bus_mode& p);
-}
diff --git a/CAN-config-generator/src/openxc/can_message.cpp b/CAN-config-generator/src/openxc/can_message.cpp
deleted file mode 100755
index 40e897b2..00000000
--- a/CAN-config-generator/src/openxc/can_message.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "can_message.hpp"
-
-namespace openxc
-{
-	std::string can_message::id() const
-	{
-		return id_;
-	}
-	
-	void can_message::id(const std::string& id)
-	{
-		id_ = id;
-	}
-	
-	std::string can_message::bus() const
-	{
-		return bus_;
-	}
-	
-	bool can_message::bit_numbering_inverted() const
-	{
-		return bit_numbering_inverted_;
-	}
-	
-	const std::vector<signal>& can_message::signals() const
-	{
-		return signals_;
-	}
-	
-	std::string can_message::name() const
-	{
-		return name_;
-	}
-	
-	std::vector<std::string> can_message::handlers() const
-	{
-		return handlers_;
-	}
-	
-	bool can_message::enabled() const
-	{
-		return enabled_;
-	}
-	
-	float can_message::max_frequency() const
-	{
-		return max_frequency_;
-	}
-	
-	float can_message::max_signal_frequency() const
-	{
-		return max_signal_frequency_;
-	}
-	
-	bool can_message::force_send_changed() const
-	{
-		return force_send_changed_;
-	}
-	
-	bool can_message::force_send_changed_signals() const
-	{
-		return force_send_changed_;
-	}
-	
-	void can_message::from_json(const nlohmann::json& j)
-	{
-		bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";
-		bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false;
-		name_ = j.count("name") ? j["name"].get<std::string>() : "";
-		handlers_ = j.count("handlers") ? j["handlers"].get<std::vector<std::string>>() : std::vector<std::string>();
-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;
-		max_frequency_ = (float)j.count("max_frequency") ? j["max_frequency"].get<float>() : 5;
-		max_signal_frequency_ = j.count("max_signal_frequency") ? j["max_signal_frequency"].get<float>() : 5;
-		force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : true;
-		force_send_changed_signals_ = j.count("force_send_changed_signals") ? j["force_send_changed_signals"].get<bool>() : false;
-		
-		if(j.count("signals"))
-		{
-			std::map<std::string, nlohmann::json> signals = j["signals"];
-			for(const auto& s : signals)
-			{
-				signal sig = s.second.get<signal>();
-				sig.id(s.first);
-				signals_.push_back(sig);
-			}
-		}
-		
-	}
-	
-	std::uint32_t can_message::get_signals_count() const
-	{
-		return (uint32_t)signals_.size();
-	}
-
-	nlohmann::json can_message::to_json() const
-	{
-		nlohmann::json j;
-		j["bus"] = bus_;
-		j["bit_numbering_inverted"] = bit_numbering_inverted_;
-		j["signals"] = signals_;
-		j["name"] = name_;
-		j["handlers"] = handlers_;
-		j["enabled"] = enabled_;
-		j["max_frequency"] = max_frequency_;
-		j["max_signal_frequency"] = max_signal_frequency_;
-		j["force_send_changed"] = force_send_changed_;
-		j["force_send_changed_signals"] = force_send_changed_signals_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const can_message& p)
-	{
-		j = p.to_json();
-	}
-	
-	void from_json(const nlohmann::json& j, can_message& p)
-	{
-		p.from_json(j);
-	}
-
-	void from_json(const nlohmann::json& j, can_message& p, const std::string& id)
-	{
-		p.from_json(j);
-		p.id(id);
-	}
-}
diff --git a/CAN-config-generator/src/openxc/can_message.hpp b/CAN-config-generator/src/openxc/can_message.hpp
deleted file mode 100755
index 3f7b0181..00000000
--- a/CAN-config-generator/src/openxc/can_message.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include <json.hpp>
-
-#include "signal.hpp"
-
-namespace openxc
-{
-	class can_message
-	{
-	private:
-		std::string						id_;
-		std::string						bus_;
-		bool							bit_numbering_inverted_;
-		std::vector<signal>				signals_;
-		std::string						name_;
-		std::vector<std::string>		handlers_;
-		bool							enabled_;
-		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::vector<signal>& signals() const;
-		std::string name() const;
-		std::vector<std::string> handlers() const;
-		bool enabled() const;
-		float max_frequency() const;
-		float max_signal_frequency() const;
-		bool force_send_changed() const;
-		bool force_send_changed_signals() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-		
-		std::uint32_t get_signals_count() const;
-	};
-
-	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);
-}
diff --git a/CAN-config-generator/src/openxc/command.cpp b/CAN-config-generator/src/openxc/command.cpp
deleted file mode 100755
index 4cc0682f..00000000
--- a/CAN-config-generator/src/openxc/command.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "command.hpp"
-
-namespace openxc
-{
-	std::string command::name() const
-	{
-		return name_;
-	}
-	
-	bool command::enabled() const
-	{
-		return enabled_;
-	}
-	
-	std::string command::handler() const
-	{
-		return handler_;
-	}
-	
-	void command::from_json(const nlohmann::json& j)
-	{
-		name_ = j.count("name") ? j["name"].get<std::string>() : "";
-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;
-		handler_ = j.count("handler") ? j["handler"].get<std::string>() : "";
-	}
-
-	nlohmann::json command::to_json() const
-	{
-		nlohmann::json j;
-		j["name"] = name_;
-		j["enabled"] = enabled_;
-		j["handler"] = handler_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const command& p)
-	{
-		j = p.to_json();
-	}
-
-	void from_json(const nlohmann::json& j, command& p)
-	{
-		p.from_json(j);
-	}
-}
diff --git a/CAN-config-generator/src/openxc/command.hpp b/CAN-config-generator/src/openxc/command.hpp
deleted file mode 100755
index 2c052266..00000000
--- a/CAN-config-generator/src/openxc/command.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <string>
-#include <json.hpp>
-
-namespace openxc
-{
-	class command
-	{
-	private:
-		std::string		name_;
-		bool			enabled_;
-		std::string		handler_;
-	public:
-		std::string name() const;
-		bool enabled() const;
-		std::string handler() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-	};
-
-	void to_json(nlohmann::json& j, const command& p);
-	void from_json(const nlohmann::json& j, command& p);
-}
diff --git a/CAN-config-generator/src/openxc/diagnostic_message.cpp b/CAN-config-generator/src/openxc/diagnostic_message.cpp
deleted file mode 100755
index 3881abef..00000000
--- a/CAN-config-generator/src/openxc/diagnostic_message.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "diagnostic_message.hpp"
-
-namespace openxc
-{
-	std::string diagnostic_message::bus() const
-	{
-		return bus_;
-	}
-	
-	std::uint32_t diagnostic_message::id() const
-	{
-		return id_;
-	}
-	
-	std::uint32_t diagnostic_message::mode() const
-	{
-		return mode_;
-	}
-	
-	float diagnostic_message::frequency() const
-	{
-		return frequency_;
-	}
-	
-	std::uint32_t diagnostic_message::pid() const
-	{
-		return pid_;
-	}
-	
-	std::string diagnostic_message::name() const
-	{
-		return name_;
-	}
-	
-	std::string diagnostic_message::decoder() const
-	{
-		return decoder_;
-	}
-	
-	std::string diagnostic_message::callback() const
-	{
-		return callback_;
-	}
-	
-	void diagnostic_message::from_json(const nlohmann::json& j)
-	{
-		bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";
-		id_ = j.count("id") ? j["id"].get<std::uint32_t>() : 0;
-		mode_ = j.count("mode") ? j["mode"].get<std::uint32_t>() : 1;
-		frequency_ = j.count("frequency") ? j["frequency"].get<float>() : 0;
-		pid_ = j.count("pid") ? j["pid"].get<std::uint32_t>() : 0;
-		name_ = j.count("name") ? j["name"].get<std::string>() : "";
-		decoder_ = j.count("decoder") ? j["decoder"].get<std::string>() : "";
-		callback_ = j.count("callback") ? j["callback"].get<std::string>() : "";
-	}
-
-	nlohmann::json diagnostic_message::to_json() const
-	{
-		nlohmann::json j;
-		j["bus"] = bus_;
-		j["id"] = id_;
-		j["mode"] = mode_;
-		j["frequency"] = frequency_;
-		j["pid"] = pid_;
-		j["name"] = name_;
-		j["decoder"] = decoder_;
-		j["callback"] = callback_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const diagnostic_message& p)
-	{
-		j = p.to_json();
-	}
-
-	void from_json(const nlohmann::json& j, diagnostic_message& p)
-	{
-		p.from_json(j);
-	}
-}
diff --git a/CAN-config-generator/src/openxc/diagnostic_message.hpp b/CAN-config-generator/src/openxc/diagnostic_message.hpp
deleted file mode 100755
index 1ceba1bd..00000000
--- a/CAN-config-generator/src/openxc/diagnostic_message.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <string>
-#include <json.hpp>
-
-namespace openxc
-{
-	class diagnostic_message
-	{
-	private:
-		std::string		bus_;
-		std::uint32_t	id_;
-		std::uint32_t	mode_;
-		float			frequency_;
-		std::uint32_t	pid_;
-		std::string		name_;
-		std::string		decoder_;
-		std::string		callback_;
-	public:
-		std::string bus() const;
-		std::uint32_t id() const;
-		std::uint32_t mode() const;
-		float frequency() const;
-		std::uint32_t pid() const;
-		std::string name() const;
-		std::string decoder() const;
-		std::string callback() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-	};
-
-	void to_json(nlohmann::json& j, const diagnostic_message& p);
-	void from_json(const nlohmann::json& j, diagnostic_message& p);
-}
diff --git a/CAN-config-generator/src/openxc/mapping.cpp b/CAN-config-generator/src/openxc/mapping.cpp
deleted file mode 100755
index 74d5c94e..00000000
--- a/CAN-config-generator/src/openxc/mapping.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "mapping.hpp"
-
-namespace openxc
-{
-	std::string mapping::mapping_name() const
-	{
-		return mapping_name_;
-	}
-	
-	std::string mapping::bus() const
-	{
-		return bus_;
-	}
-	
-	std::string mapping::database() const
-	{
-		return database_;
-	}
-	
-	bool mapping::bit_numbering_inverted() const
-	{
-		return bit_numbering_inverted_;
-	}
-	
-	bool mapping::enabled() const
-	{
-		return enabled_;
-	}
-	
-	void mapping::from_json(const nlohmann::json& j)
-	{
-		mapping_name_ = j.count("mapping") ? j["mapping"].get<std::string>() : "";
-		bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";
-		database_ = j.count("database") ? j["database"].get<std::string>() : "";
-		bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false;
-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;
-	}
-
-	nlohmann::json mapping::to_json() const
-	{
-		nlohmann::json j;
-		j["mapping"] = mapping_name_;
-		j["bus"] = bus_;
-		j["database"] = database_;
-		j["bit_numbering_inverted"] = bit_numbering_inverted_;
-		j["enabled"] = enabled_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const mapping& p)
-	{
-		j = p.to_json();
-	}
-
-	void from_json(const nlohmann::json& j, mapping& p)
-	{
-		p.from_json(j);
-	}
-}
diff --git a/CAN-config-generator/src/openxc/mapping.hpp b/CAN-config-generator/src/openxc/mapping.hpp
deleted file mode 100755
index 30895cba..00000000
--- a/CAN-config-generator/src/openxc/mapping.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <string>
-#include <json.hpp>
-
-namespace openxc
-{
-	class mapping
-	{
-	private:
-		std::string		mapping_name_;
-		std::string		bus_;
-		std::string		database_;
-		bool			bit_numbering_inverted_;
-		bool			enabled_;
-	public:
-		std::string mapping_name() const;
-		std::string bus() const;
-		std::string database() const;
-		bool bit_numbering_inverted() const;
-		bool enabled() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-	};
-
-	void to_json(nlohmann::json& j, const mapping& p);
-	void from_json(const nlohmann::json& j, mapping& p);
-}
diff --git a/CAN-config-generator/src/openxc/message_set.cpp b/CAN-config-generator/src/openxc/message_set.cpp
deleted file mode 100755
index d6745bfc..00000000
--- a/CAN-config-generator/src/openxc/message_set.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <sstream>
-#include "message_set.hpp"
-
-namespace openxc
-{
-	message_set::message_set()
-		: name_{""}
-		, bit_numbering_inverted_{false}
-		, max_message_frequency_{0}
-		, raw_can_mode_{can_bus_mode::off}
-		, parents_{}
-		, initializers_{}
-		, loopers_{}
-		, buses_{}
-		, messages_{}
-		, diagnostic_messages_{}
-		, mappings_{}
-		, extra_sources_{}
-		, commands_{}
-	{
-	}
-	
-	std::string message_set::name() const
-	{
-		return name_;
-	}
-	
-	bool message_set::bit_numbering_inverted() const
-	{
-		return bit_numbering_inverted_;
-	}
-	
-	float message_set::max_message_frequency() const
-	{
-		return max_message_frequency_;
-	}
-	
-	can_bus_mode message_set::raw_can_mode() const
-	{
-		return raw_can_mode_;
-	}
-	
-	const std::vector<std::string>& message_set::parents() const
-	{
-		return parents_;
-	}
-	
-	const std::vector<std::string>& message_set::initializers() const
-	{
-		return initializers_;
-	}
-	
-	const std::vector<std::string>& message_set::loopers() const
-	{
-		return loopers_;
-	}
-	
-	const std::map<std::string, can_bus>& message_set::buses() const
-	{
-		return buses_;
-	}
-	
-	const std::vector<can_message>& message_set::messages() const
-	{
-		return messages_;
-	}
-	
-	const std::vector<diagnostic_message>& message_set::diagnostic_messages() const
-	{
-		return diagnostic_messages_;
-	}
-	
-	const std::vector<mapping>& message_set::mappings() const
-	{
-		return mappings_;
-	}
-	
-	const std::vector<std::string>& message_set::extra_sources() const
-	{
-		return extra_sources_;
-	}
-	
-	const std::vector<command>& message_set::commands() const
-	{
-		return commands_;
-	}
-
-	void message_set::from_json(const nlohmann::json& j)
-	{
-		name_ = j["name"].get<std::string>();
-		bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false; // TODO: should be true by default if database-backed.
-		max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<float>() : 0.0f;
-		raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;
-		parents_ = j.count("parents") ? j["parents"].get<std::vector<std::string>>() : std::vector<std::string>();
-		initializers_ = j.count("initializers") ? j["initializers"].get<std::vector<std::string>>() : std::vector<std::string>();
-		loopers_ = j.count("loopers") ? j["loopers"].get<std::vector<std::string>>() : std::vector<std::string>();
-		buses_ = j.count("buses") ? j["buses"].get<std::map<std::string, can_bus>>() : std::map<std::string, can_bus>();
-		//messages_ = j.count("messages") ? j["messages"].get<std::map<std::string, can_message>>() : std::map<std::string, can_message>();
-		diagnostic_messages_ = j.count("diagnostic_messages") ? j["diagnostic_messages"].get<std::vector<diagnostic_message>>() : std::vector<diagnostic_message>();
-		mappings_ = j.count("mappings") ? j["mappings"].get<std::vector<mapping>>() : std::vector<mapping>();
-		extra_sources_ = j.count("extra_sources") ? j["extra_sources"].get<std::vector<std::string>>() : std::vector<std::string>();
-		commands_ = j.count("commands") ? j["commands"].get<std::vector<command>>() : std::vector<command>();
-		
-		
-		if (j.count("messages"))
-		{
-			std::map<std::string, nlohmann::json> messages = j["messages"];
-			for(const std::map<std::string, nlohmann::json>::value_type& m : messages)
-			{
-				can_message cm = m.second.get<can_message>();
-				cm.id(m.first);
-				messages_.push_back(cm);
-			}
-		}
-	}
-
-	nlohmann::json message_set::to_json() const
-	{
-		nlohmann::json j;
-		j["name_"]						= name_;
-		j["bit_numbering_inverted"]		= bit_numbering_inverted_;
-		j["max_message_frequency"]		= max_message_frequency_;
-		j["raw_can_mode"]				= raw_can_mode_;
-		j["parents"]					= parents_;
-		j["initializers"]				= initializers_;
-		j["loopers"]					= loopers_;
-		j["buses"]						= buses_;
-		j["messages"]					= messages_;
-		j["diagnostic_messages"]		= diagnostic_messages_;
-		j["mappings"]					= mappings_;
-		j["extra_sources"]				= extra_sources_;
-		j["commands"]					= commands_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const message_set& p)
-	{
-		j = p.to_json();
-	}
-
-	void from_json(const nlohmann::json& j, message_set& p)
-	{
-		p.from_json(j);
-	}
-}
diff --git a/CAN-config-generator/src/openxc/message_set.hpp b/CAN-config-generator/src/openxc/message_set.hpp
deleted file mode 100755
index 935817ee..00000000
--- a/CAN-config-generator/src/openxc/message_set.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include <map>
-#include <json.hpp>
-
-#include "can_bus.hpp"
-#include "can_message.hpp"
-#include "diagnostic_message.hpp"
-#include "mapping.hpp"
-#include "command.hpp"
-
-namespace openxc
-{
-	class message_set
-	{
-	private:
-		std::string							name_;
-		bool								bit_numbering_inverted_;
-		float								max_message_frequency_;
-		can_bus_mode						raw_can_mode_;
-		std::vector<std::string>			parents_;
-		std::vector<std::string>			initializers_;
-		std::vector<std::string>			loopers_;
-		std::map<std::string, can_bus>		buses_;
-		//std::map<std::string, can_message>	messages_;
-		std::vector<can_message>			messages_;
-		std::vector<diagnostic_message>		diagnostic_messages_;
-		std::vector<mapping>				mappings_;
-		std::vector<std::string>			extra_sources_;
-		std::vector<command>				commands_;
-
-	public:
-		message_set();
-		message_set(const message_set&) = default;
-		message_set(message_set&&) = default;
-		
-		std::string name() const;
-		bool bit_numbering_inverted() const;
-		float max_message_frequency() const;
-		can_bus_mode raw_can_mode() const;
-		const std::vector<std::string>& parents() const;
-		const std::vector<std::string>& initializers() const;
-		const std::vector<std::string>& loopers() const;
-		const std::map<std::string, can_bus>& buses() const;
-		const std::vector<can_message>& messages() const;
-		const std::vector<diagnostic_message>& diagnostic_messages() const;
-		const std::vector<mapping>& mappings() const;
-		const std::vector<std::string>& extra_sources() const;
-		const std::vector<command>& commands() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-	};
-
-	void to_json(nlohmann::json& j, const message_set& p);
-	void from_json(const nlohmann::json& j, message_set& p);
-}
diff --git a/CAN-config-generator/src/openxc/signal.cpp b/CAN-config-generator/src/openxc/signal.cpp
deleted file mode 100755
index e9c1088b..00000000
--- a/CAN-config-generator/src/openxc/signal.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "signal.hpp"
-
-namespace openxc
-{
-	std::string signal::id() const
-	{
-		return id_;
-	}
-	
-	void signal::id(const std::string& id)
-	{
-		id_ = id;
-	}
-	
-	void id(const std::string& id);
-	
-	std::string signal::generic_name() const
-	{
-		return generic_name_;
-	}
-	
-	std::uint32_t signal::bit_position() const
-	{
-		return bit_position_;
-	}
-	
-	std::uint32_t signal::bit_size() const
-	{
-		return bit_size_;
-	}
-	
-	float signal::factor() const
-	{
-		return factor_;
-	}
-	
-	float signal::offset() const
-	{
-		return offset_;
-	}
-	
-	std::string signal::decoder() const
-	{
-		return decoder_;
-	}
-	
-	bool signal::ignore() const
-	{
-		return ignore_;
-	}
-	
-	bool signal::enabled() const
-	{
-		return enabled_;
-	}
-	
-	const std::map<std::string, std::vector<std::uint32_t>>& signal::states() const
-	{
-		return states_;
-	}
-	
-	float signal::max_frequency() const
-	{
-		return max_frequency_;
-	}
-	
-	bool signal::send_same() const
-	{
-		return send_same_;
-	}
-	
-	bool signal::force_send_changed() const
-	{
-		return force_send_changed_;
-	}
-	
-	bool signal::writable() const
-	{
-		return writable_;
-	}
-	
-	std::string signal::encoder() const
-	{
-		return encoder_;
-	}
-	
-	void signal::from_json(const nlohmann::json& j)
-	{
-		generic_name_ = j.count("generic_name") ? j["generic_name"].get<std::string>() : "";
-		bit_position_ = j.count("bit_position") ? j["bit_position"].get<std::uint32_t>() : 0;
-		bit_size_ = j.count("bit_size") ? j["bit_size"].get<std::uint32_t>() : 0;
-		factor_ = j.count("factor") ? j["factor"].get<float>() : 1.0f;
-		offset_ = j.count("offset") ? j["offset"].get<float>() : 0.0f;
-		decoder_ = j.count("decoder") ? j["decoder"].get<std::string>() : "";
-		ignore_ = j.count("ignore") ? j["ignore"].get<bool>() : false;
-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;
-		max_frequency_ = j.count("max_frequency") ? j["max_frequency"].get<float>() : 0.0f;
-		send_same_ = j.count("send_same") ? j["send_same"].get<bool>() : true;
-		force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : false;
-		writable_ = j.count("writable") ? j["writable"].get<bool>() : false;
-		encoder_ = j.count("encoder") ? j["encoder"].get<std::string>() : "";
-
-		if (j.count("states"))
-		{
-			std::map<std::string, nlohmann::json> items = j["states"];
-			for(const auto& i : items)
-			{
-				states_[i.first] = i.second.get<std::vector<std::uint32_t>>();
-			}
-		}
-	}
-
-	nlohmann::json signal::to_json() const
-	{
-		nlohmann::json j;
-		j["generic_name"] = generic_name_;
-		j["bit_position"] = bit_position_;
-		j["bit_size"] = bit_size_;
-		j["factor"] = factor_;
-		j["offset"] = offset_;
-		j["decoder"] = decoder_;
-		j["ignore"] = ignore_;
-		j["enabled"] = enabled_;
-		j["states"] = states_;
-		j["max_frequency"] = max_frequency_;
-		j["send_same"] = send_same_;
-		j["force_send_changed"] = force_send_changed_;
-		j["writable"] = writable_;
-		j["encoder"] = encoder_;
-		return j;
-	}
-
-	void to_json(nlohmann::json& j, const signal& p)
-	{
-		j = p.to_json();
-	}
-
-	void from_json(const nlohmann::json& j, signal& p)
-	{
-		p.from_json(j);
-	}
-}
diff --git a/CAN-config-generator/src/openxc/signal.hpp b/CAN-config-generator/src/openxc/signal.hpp
deleted file mode 100755
index e0124c35..00000000
--- a/CAN-config-generator/src/openxc/signal.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include <string>
-#include <map>
-#include <vector>
-#include <cstdint>
-#include <json.hpp>
-
-namespace openxc
-{
-	class signal
-	{
-	private:
-		std::string											id_;
-		std::string											generic_name_;
-		std::uint32_t										bit_position_;
-		std::uint32_t										bit_size_;
-		float												factor_;
-		float												offset_;
-		std::string											decoder_;
-		bool												ignore_;
-		bool												enabled_;
-		std::map<std::string, std::vector<std::uint32_t>>	states_;
-		float										max_frequency_;
-		bool												send_same_;
-		bool												force_send_changed_;
-		bool												writable_;
-		std::string											encoder_;
-	public:
-		std::string id() const;
-		void id(const std::string& id);
-		std::string generic_name() const;
-		std::uint32_t bit_position() const;
-		std::uint32_t bit_size() const;
-		float factor() const;
-		float offset() const;
-		std::string decoder() const;
-		bool ignore() const;
-		bool enabled() const;
-		const std::map<std::string, std::vector<std::uint32_t>>& states() const;
-		float max_frequency() const;
-		bool send_same() const;
-		bool force_send_changed() const;
-		bool writable() const;
-		std::string encoder() const;
-		
-		void from_json(const nlohmann::json& j);
-		nlohmann::json to_json() const;
-	};
-
-	void to_json(nlohmann::json& j, const signal& p);
-	void from_json(const nlohmann::json& j, signal& p);
-}
-- 
cgit 1.2.3-korg