X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Fapplication-generated.cpp;h=45b6a8cc8f192b7fdf85c105ecb2c11d61188038;hb=d2180abe18533be7cbe68971a6767e5c2a0ecf6d;hp=60a21f5180ae73217efbd3110f3a7b62e617d4b4;hpb=32e25cbca210a359b09768537b6f443fe90a3070;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp
index 60a21f51..45b6a8cc 100644
--- a/low-can-binding/binding/application-generated.cpp
+++ b/low-can-binding/binding/application-generated.cpp
@@ -1,12 +1,101 @@
 #include "application.hpp"
 #include "../can/can-decoder.hpp"
+#include "../can/can-encoder.hpp"
 
 application_t::application_t()
 	: can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}}
 	, can_message_set_{
-		{std::make_shared<can_message_set_t>(can_message_set_t{0,"example",
+		{std::make_shared<can_message_set_t>(can_message_set_t{0,"AGL Virtual Car",
 			{ // beginning can_message_definition_ vector
-				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x3D9,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "ls",
+				 0x30,
+				 false,
+				 can_message_format_t::EXTENDED,
+				 frequency_clock_t(5.00000f),
+				 true,
+					{ // beginning can_signals vector
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.fan.speed",
+							32,
+							8,
+							23.5294f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.temperature.left",
+							0,
+							8,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							true,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.temperature.right",
+							8,
+							8,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							true,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.temperature.average",
+							16,
+							8,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							true,
+							nullptr,
+							nullptr,
+							false
+						})}
+					} // end can_signals vector
+				})} // end can_message_definition entry
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x3D9,
+				 true,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
 					{ // beginning can_signals vector
 						{std::make_shared<can_signal_t> (can_signal_t{
 							"engine.speed",
@@ -40,7 +129,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -64,7 +153,13 @@ application_t::application_t()
 						})}
 					} // end can_signals vector
 				})} // end can_message_definition entry
-,				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x3E9,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x3E9,
+				 false,
+				 can_message_format_t::EXTENDED,
+				 frequency_clock_t(5.00000f),
+				 true,
 					{ // beginning can_signals vector
 						{std::make_shared<can_signal_t> (can_signal_t{
 							"vehicle.average.speed",
@@ -86,7 +181,13 @@ application_t::application_t()
 						})}
 					} // end can_signals vector
 				})} // end can_message_definition entry
-,				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x4D1,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x4D1,
+				 false,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
 					{ // beginning can_signals vector
 						{std::make_shared<can_signal_t> (can_signal_t{
 							"engine.oil.temp",
@@ -120,13 +221,175 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
+							nullptr,
+							false
+						})}
+					} // end can_signals vector
+				})} // end can_message_definition entry
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x5D1,
+				 false,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
+					{ // beginning can_signals vector
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"accelerator.pedal.position",
+							16,
+							8,
+							0.500000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"steering.wheel.angle",
+							4,
+							12,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})}
+					} // end can_signals vector
+				})} // end can_message_definition entry
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x5D2,
+				 false,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
+					{ // beginning can_signals vector
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"transmission.gearinfo",
+							20,
+							4,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"transmission.mode",
+							16,
+							4,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})}
+					} // end can_signals vector
+				})} // end can_message_definition entry
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x5D3,
+				 false,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
+					{ // beginning can_signals vector
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"turnsignal.status",
+							26,
+							3,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"lightstatus.brake",
+							7,
+							1,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							decoder_t::decode_boolean,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"parking.brake.status",
+							8,
+							1,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})}
 					} // end can_signals vector
 				})} // end can_message_definition entry
-,				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x620,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x620,
+				 false,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
 					{ // beginning can_signals vector
 						{std::make_shared<can_signal_t> (can_signal_t{
 							"doors.boot.open",
@@ -142,7 +405,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -160,7 +423,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -178,7 +441,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -196,7 +459,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -214,13 +477,19 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})}
 					} // end can_signals vector
 				})} // end can_message_definition entry
-,				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x799,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{
+				 "hs",
+				 0x799,
+				 false,
+				 can_message_format_t::STANDARD,
+				 frequency_clock_t(5.00000f),
+				 true,
 					{ // beginning can_signals vector
 						{std::make_shared<can_signal_t> (can_signal_t{
 							"windows.front_left.open",
@@ -236,7 +505,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -254,7 +523,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -272,7 +541,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})},
@@ -290,7 +559,7 @@ application_t::application_t()
 							{
 							},
 							false,
-							decoder_t::booleanDecoder,
+							decoder_t::decode_boolean,
 							nullptr,
 							false
 						})}
@@ -308,7 +577,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					5,
@@ -319,7 +589,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					10,
@@ -330,7 +601,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					11,
@@ -341,7 +613,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					12,
@@ -352,7 +625,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					13,
@@ -363,7 +637,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					15,
@@ -374,7 +649,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					16,
@@ -385,7 +661,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					17,
@@ -396,7 +673,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					31,
@@ -407,7 +685,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					45,
@@ -418,7 +697,8 @@ application_t::application_t()
 					0.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					47,
@@ -429,7 +709,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					51,
@@ -440,7 +721,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					70,
@@ -451,7 +733,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					76,
@@ -462,7 +745,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					82,
@@ -473,7 +757,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					90,
@@ -484,7 +769,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					91,
@@ -495,7 +781,8 @@ application_t::application_t()
 					5.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					92,
@@ -506,7 +793,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					94,
@@ -517,7 +805,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 ,				{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
 					99,
@@ -528,7 +817,8 @@ application_t::application_t()
 					1.00000f,
 					decoder_t::decode_obd2_response,
 					nullptr,
-					true
+					true,
+					false
 				})}
 
 			} // end diagnostic_messages_ vector
@@ -551,7 +841,7 @@ application_t::application_t()
 		std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages = cms->get_diagnostic_messages();
 		for(auto& dm : diagnostic_messages)
 		{
-			dm->set_parent(cms.get());
+			dm->set_parent(cms);
 		}
 	}
 		}