plugins: Use agl-vcar plugin by default

Bug-AGL: SPEC-2988

Change-Id: I8935210e4cc2ec290a809bc1bfece4c36d367cda
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

4 files changed, 745 insertions, 755 deletions

diff --git a/conf.d/project/etc/control-low-can.json b/conf.d/project/etc/control-low-can.json
index 3dbdf18b..e59c39c4 100644
--- a/conf.d/project/etc/control-low-can.json
+++ b/conf.d/project/etc/control-low-can.json
@@ -12,19 +12,9 @@
 	},
 	"plugins": [
 		{
-			"uid": "agl-callbacks",
-			"info": "AGL signals",
-			"libs": "agl-signals.ctlso"
-		},
-		{
-			"uid": "j1939-callbacks",
-			"info": "J1939 signals",
-			"libs": "j1939-signals.ctlso"
-		},
-		{
-			"uid": "nmea2000-callbacks",
-			"info": "NMEA2000 Signals",
-			"libs": "nmea2000-signals.ctlso"
+			"uid": "agl-vcar-signals",
+			"info": "agl-vcar signals",
+			"libs": "agl-vcar-signals.ctlso"
 		}
 	]
 }
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index b87f3244..6d0bc0bf 100755
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-PROJECT_TARGET_ADD(agl-signals)
+PROJECT_TARGET_ADD(agl-vcar-signals)
 
 	# Define targets
 	ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.cpp)
diff --git a/plugins/agl-signals.cpp b/plugins/agl-signals.cpp
deleted file mode 100644
index 5f00e290..00000000
--- a/plugins/agl-signals.cpp
+++ /dev/null
@@ -1,741 +0,0 @@
-#include "binding/application.hpp"
-#include "can/can-decoder.hpp"
-#include "can/can-encoder.hpp"
-#include <ctl-plugin.h>
-
-extern "C"
-{
-
-CTLP_LUA_REGISTER("TO-EDIT");
-
-
-std::shared_ptr<message_set_t> message_set =
-	std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car",
-		{ // beginning message_definition_ vector
-			{std::make_shared<message_definition_t>(message_definition_t{"ls", 0x30,"", 0, 0, false, frequency_clock_t(5.00000f), true,
-				{ // beginning signals vector
-					{std::make_shared<signal_t> (signal_t{
-						"hvac.fan.speed",// generic_name
-						32,// bit_position
-						8,// bit_size
-						23.5294f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"hvac.temperature.left",// generic_name
-						0,// bit_position
-						8,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						true,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"hvac.temperature.right",// generic_name
-						8,// bit_position
-						8,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						true,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"hvac.temperature.average",// generic_name
-						16,// bit_position
-						8,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						true,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})}
-					} // end signals vector
-				})} // end message_definition entry
-,			{std::make_shared<message_definition_t>(message_definition_t{"hs", 0x3D9,"", 0, 0, true, frequency_clock_t(5.00000f), true,
-				{ // beginning signals vector
-					{std::make_shared<signal_t> (signal_t{
-						"engine.speed",// generic_name
-						16,// bit_position
-						16,// bit_size
-						0.250000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"fuel.level.low",// generic_name
-						55,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"fuel.level",// generic_name
-						8,// bit_position
-						8,// bit_size
-						0.392157f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})}
-					} // end signals vector
-				})} // end message_definition entry
-,			{std::make_shared<message_definition_t>(message_definition_t{"hs", 0x3E9,"", 0, 0, false, frequency_clock_t(5.00000f), true,
-				{ // beginning signals vector
-					{std::make_shared<signal_t> (signal_t{
-						"vehicle.average.speed",// generic_name
-						0,// bit_position
-						15,// bit_size
-						0.0156250f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})}
-					} // end signals vector
-				})} // end message_definition entry
-,			{std::make_shared<message_definition_t>(message_definition_t{"hs", 0x4D1,"", 0, 0, false, frequency_clock_t(5.00000f), true,
-				{ // beginning signals vector
-					{std::make_shared<signal_t> (signal_t{
-						"engine.oil.temp",// generic_name
-						16,// bit_position
-						8,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						nullptr,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"engine.oil.temp.high",// generic_name
-						7,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})}
-					} // end signals vector
-				})} // end message_definition entry
-,			{std::make_shared<message_definition_t>(message_definition_t{"hs", 0x620,"", 0, 0, false, frequency_clock_t(5.00000f), true,
-				{ // beginning signals vector
-					{std::make_shared<signal_t> (signal_t{
-						"doors.boot.open",// generic_name
-						47,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"doors.front_left.open",// generic_name
-						43,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"doors.front_right.open",// generic_name
-						44,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"doors.rear_left.open",// generic_name
-						46,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"doors.rear_right.open",// generic_name
-						45,// bit_position
-						4,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})}
-					} // end signals vector
-				})} // end message_definition entry
-,			{std::make_shared<message_definition_t>(message_definition_t{"hs", 0x799,"", 0, 0, false, frequency_clock_t(5.00000f), true,
-				{ // beginning signals vector
-					{std::make_shared<signal_t> (signal_t{
-						"windows.front_left.open",// generic_name
-						43,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"windows.front_right.open",// generic_name
-						44,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"windows.rear_left.open",// generic_name
-						46,// bit_position
-						1,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})},
-					{std::make_shared<signal_t> (signal_t{
-						"windows.rear_right.open",// generic_name
-						45,// bit_position
-						4,// bit_size
-						1.00000f,// factor
-						0.00000,// offset
-						0,// min_value
-						0,// max_value
-						frequency_clock_t(0.00000f),// frequency
-						true,// send_same
-						false,// force_send_changed
-						{
-						},// states
-						false,// writable
-						decoder_t::decode_boolean,// decoder
-						nullptr,// encoder
-						false,// received
-						std::make_pair<bool, int>(false, 0),// multiplex
-						0,// is_big_endian
-						static_cast<sign_t>(0),// signed
-						-1,// bit_sign_position
-						""// unit
-					})}
-					} // end signals vector
-				})} // end message_definition entry
-
-		}, // end message_definition vector
-		{ // beginning diagnostic_messages_ vector
-			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				4,
-				"engine.load",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				5,
-				"engine.coolant.temperature",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				10,
-				"fuel.pressure",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				11,
-				"intake.manifold.pressure",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				12,
-				"engine.speed",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				13,
-				"vehicle.speed",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				15,
-				"intake.air.temperature",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				16,
-				"mass.airflow",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				17,
-				"throttle.position",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				31,
-				"running.time",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				45,
-				"EGR.error",
-				0,
-				0,
-				UNIT::INVALID,
-				0.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				47,
-				"fuel.level",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				51,
-				"barometric.pressure",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				70,
-				"ambient.air.temperature",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				76,
-				"commanded.throttle.position",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				82,
-				"ethanol.fuel.percentage",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				90,
-				"accelerator.pedal.position",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				91,
-				"hybrid.battery-pack.remaining.life",
-				0,
-				0,
-				UNIT::INVALID,
-				5.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				92,
-				"engine.oil.temperature",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				94,
-				"engine.fuel.rate",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-,			{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
-				99,
-				"engine.torque",
-				0,
-				0,
-				UNIT::INVALID,
-				1.00000f,
-				decoder_t::decode_obd2_response,
-				nullptr,
-				true,
-				false
-			})}
-		} // end diagnostic_messages_ vector
-	}); // end message_set entry
-
-
-CTLP_ONLOAD(plugin, composerHandle)
-{
-	application_t *application_ = (application_t*) composerHandle;
-	application_->add_message_set(message_set);
-	return 0;
-}
-}
diff --git a/plugins/agl-vcar-signals.cpp b/plugins/agl-vcar-signals.cpp
new file mode 100644
index 00000000..12b2d630
--- /dev/null
+++ b/plugins/agl-vcar-signals.cpp
@@ -0,0 +1,741 @@
+#include <binding/application.hpp>
+#include <can/can-decoder.hpp>
+#include <can/can-encoder.hpp>
+
+extern "C"
+{
+
+CTLP_CAPI_REGISTER("agl-vcar-signals");
+
+std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car",
+			{ // beginning message_definition_ vector
+				{std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",8,0,true,frequency_clock_t(5.00000f),true,
+					{ // beginning signals vector
+						{std::make_shared<signal_t> (signal_t{
+							"hvac.fan.speed",// generic_name
+							32,// bit_position
+							8,// bit_size
+							23.5294f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"hvac.temperature.left",// generic_name
+							0,// bit_position
+							8,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"hvac.temperature.right",// generic_name
+							8,// bit_position
+							8,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"hvac.temperature.average",// generic_name
+							16,// bit_position
+							8,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})}
+					} // end signals vector
+				})} // end message_definition entry
+,				{std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,"",8,128,true,frequency_clock_t(5.00000f),true,
+					{ // beginning signals vector
+						{std::make_shared<signal_t> (signal_t{
+							"engine.speed",// generic_name
+							16,// bit_position
+							16,// bit_size
+							0.250000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"fuel.level.low",// generic_name
+							55,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"fuel.level",// generic_name
+							8,// bit_position
+							8,// bit_size
+							0.392157f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})}
+					} // end signals vector
+				})} // end message_definition entry
+,				{std::make_shared<message_definition_t>(message_definition_t{"hs",0x3E9,"",8,0,true,frequency_clock_t(5.00000f),true,
+					{ // beginning signals vector
+						{std::make_shared<signal_t> (signal_t{
+							"vehicle.average.speed",// generic_name
+							0,// bit_position
+							15,// bit_size
+							0.0156250f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							false,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})}
+					} // end signals vector
+				})} // end message_definition entry
+,				{std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,"",8,0,true,frequency_clock_t(5.00000f),true,
+					{ // beginning signals vector
+						{std::make_shared<signal_t> (signal_t{
+							"engine.oil.temp",// generic_name
+							16,// bit_position
+							8,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							nullptr,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"engine.oil.temp.high",// generic_name
+							7,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})}
+					} // end signals vector
+				})} // end message_definition entry
+,				{std::make_shared<message_definition_t>(message_definition_t{"hs",0x620,"",8,0,true,frequency_clock_t(5.00000f),true,
+					{ // beginning signals vector
+						{std::make_shared<signal_t> (signal_t{
+							"doors.boot.open",// generic_name
+							47,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"doors.front_left.open",// generic_name
+							43,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"doors.front_right.open",// generic_name
+							44,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"doors.rear_left.open",// generic_name
+							46,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"doors.rear_right.open",// generic_name
+							45,// bit_position
+							4,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})}
+					} // end signals vector
+				})} // end message_definition entry
+,				{std::make_shared<message_definition_t>(message_definition_t{"hs",0x799,"",8,0,true,frequency_clock_t(5.00000f),true,
+					{ // beginning signals vector
+						{std::make_shared<signal_t> (signal_t{
+							"windows.front_left.open",// generic_name
+							43,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"windows.front_right.open",// generic_name
+							44,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"windows.rear_left.open",// generic_name
+							46,// bit_position
+							1,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})},
+						{std::make_shared<signal_t> (signal_t{
+							"windows.rear_right.open",// generic_name
+							45,// bit_position
+							4,// bit_size
+							1.00000f,// factor
+							0.00000f,// offset
+							0,// min_value
+							0,// max_value
+							frequency_clock_t(0.00000f),// frequency
+							true,// send_same
+							false,// force_send_changed
+							{
+							},// states
+							true,// writable
+							decoder_t::decode_boolean,// decoder
+							nullptr,// encoder
+							false,// received
+							std::make_pair<bool, int>(false, 0),// multiplex
+							false,// is_big_endian
+							static_cast<sign_t>(0),// signed
+							-1,// bit_sign_position
+							""// unit
+						})}
+					} // end signals vector
+				})} // end message_definition entry
+
+		}, // end message_definition vector
+			{ // beginning diagnostic_messages_ vector
+				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					4,
+					"engine.load",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					5,
+					"engine.coolant.temperature",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					10,
+					"fuel.pressure",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					11,
+					"intake.manifold.pressure",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					12,
+					"engine.speed",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					13,
+					"vehicle.speed",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					15,
+					"intake.air.temperature",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					16,
+					"mass.airflow",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					17,
+					"throttle.position",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					31,
+					"running.time",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					45,
+					"EGR.error",
+					0,
+					0,
+					UNIT::INVALID,
+					0.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					47,
+					"fuel.level",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					51,
+					"barometric.pressure",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					70,
+					"ambient.air.temperature",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					76,
+					"commanded.throttle.position",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					82,
+					"ethanol.fuel.percentage",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					90,
+					"accelerator.pedal.position",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					91,
+					"hybrid.battery-pack.remaining.life",
+					0,
+					0,
+					UNIT::INVALID,
+					5.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					92,
+					"engine.oil.temperature",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					94,
+					"engine.fuel.rate",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
+					99,
+					"engine.torque",
+					0,
+					0,
+					UNIT::INVALID,
+					1.00000f,
+					decoder_t::decode_obd2_response,
+					nullptr,
+					true,
+					false
+				})}
+
+			} // end diagnostic_messages_ vector
+		}); // end message_set entry
+
+CTLP_ONLOAD(plugin, handle)
+{
+	afb_api_t api = (afb_api_t) plugin->api;
+	CtlConfigT* CtlConfig = (CtlConfigT*) afb_api_get_userdata(api);
+	application_t* app = (application_t*) getExternalData(CtlConfig);
+
+	return app->add_message_set(cms);
+}
+
+}