Update agl-vcar to match test expectationsicefish_9.0.4icefish/9.0.49.0.4

The regeneration of the agl-vcar and default plugin signals code
broke some expectations of the afb-test and pyagl tests, changes
to get things back to a good state:

- Add the missing J1939 messages that were in default-signals.cpp
  before it was regenerated to the agl-vcar signals.json, and then
  regenerate the affected cpp files; this fixes the J1939 test
  expectations.  An alternative approach would be using the ability
  to load a different set of signals by configuring a different
  plugin, but that has been deemed not workable for AGL CI.
- Remove the old application-generated.cpp file from the agl-vcar
  examples directory to avoid confusion.
- Update the testFilter01pass.canreplay CAN data file used for the
  Filter_Test_01/Step_2 test to use the non-FD version of the
  0x3D9 CAN message that matches the agl-vcar definition.  A new
  0x3DA message that is a FD copy of 0x3D9 has been added to the
  agl-vcar signals.json to allow testing CAN FD messaging, and a new
  testFilter01pass-FD.canreplay data file has been added that can
  potentially be used for doing so.

Bug-AGL: SPEC-3603

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I24c960ca33aaf122ac83a2583cb2df0cd6dbd9e3

1 files changed, 673 insertions, 0 deletions

diff --git a/plugins/default-signals.cpp b/plugins/default-signals.cpp
index b38f168c..5d7629d1 100644
--- a/plugins/default-signals.cpp
+++ b/plugins/default-signals.cpp
@@ -569,6 +569,76 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set
 				})}
 			} // end signals vector
 		})} // end message_definition entry
+,		{std::make_shared<message_definition_t>(message_definition_t{"hs",0x3DA,"",8,2,frequency_clock_t(5.00000f),true,
+			{ // beginning signals vector
+				{std::make_shared<signal_t> (signal_t{
+					"fd.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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"fd.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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"fd.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
+					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,frequency_clock_t(5.00000f),true,
 			{ // beginning signals vector
 				{std::make_shared<signal_t> (signal_t{
@@ -849,6 +919,609 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set
 				})}
 			} // end signals vector
 		})} // end message_definition entry
+,		{std::make_shared<message_definition_t>(message_definition_t{"j1939",130306,"Wind.Data",8,8,frequency_clock_t(5.00000f),true,
+			{ // beginning signals vector
+				{std::make_shared<signal_t> (signal_t{
+					"Wind.Data.Reference",// generic_name
+					40,// bit_position
+					3,// 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
+					{
+						{2,"Apparent"},
+						{1,"Magnetic (ground referenced to Magnetic North)"},
+						{3,"True (boat referenced)"},
+						{0,"True (ground referenced to North)"},
+						{4,"True (water referenced)"}
+					},// states
+					false,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Wind.Data.Reserved",// generic_name
+					43,// bit_position
+					21,// 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
+					false,// writable
+					decoder_t::decode_bytes,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Wind.Data.Sid",// 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
+					false,// writable
+					nullptr,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Wind.Data.Wind.Angle",// generic_name
+					24,// bit_position
+					16,// bit_size
+					0.000100000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"rad"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Wind.Data.Wind.Speed",// generic_name
+					8,// bit_position
+					16,// bit_size
+					0.0100000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"m/s"// unit
+				})}
+			} // end signals vector
+		})} // end message_definition entry
+,		{std::make_shared<message_definition_t>(message_definition_t{"j1939",61442,"ETC1",8,8,frequency_clock_t(5.00000f),true,
+			{ // beginning signals vector
+				{std::make_shared<signal_t> (signal_t{
+					"Eng.Momentary.Overspeed.Enable",// generic_name
+					32,// bit_position
+					2,// 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
+					{
+						{0,"MomentaryEngOverspeedIsDisabled"},
+						{1,"MomentaryEngOverspeedIsEnabled"},
+						{2,"Reserved"},
+						{3,"TakeNoAction"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Momentary.Eng.Max.Power.Enable",// generic_name
+					36,// bit_position
+					2,// 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
+					{
+						{2,"fault"},
+						{1,"mmntarilyRqingMaxPowerAvailable"},
+						{3,"notAvailable"},
+						{0,"notRqingMaxPowerAvailable"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Percent.Clutch.Slip",// generic_name
+					24,// bit_position
+					8,// bit_size
+					0.400000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"%"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Progressive.Shift.Disable",// generic_name
+					34,// bit_position
+					2,// 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
+					{
+						{1,"ProgressiveShiftIsDisabled"},
+						{0,"ProgressiveShiftIsNotDisabled"},
+						{2,"Reserved"},
+						{3,"TakeNoAction"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Src.Addrss.Of.Ctrllng.Dvc.Fr.Trns.Cntrl",// generic_name
+					56,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Trans.Driveline.Engaged",// generic_name
+					0,// bit_position
+					2,// 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
+					{
+						{0,"DrivelineDisengaged"},
+						{1,"DrivelineEngaged"},
+						{2,"Error"},
+						{3,"NotAvailable"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Trans.Input.Shaft.Speed",// generic_name
+					40,// bit_position
+					16,// bit_size
+					0.125000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"rpm"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Trans.Output.Shaft.Speed",// generic_name
+					8,// bit_position
+					16,// bit_size
+					0.125000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"rpm"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Trans.Shift.In.Process",// generic_name
+					4,// bit_position
+					2,// 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
+					{
+						{2,"Error"},
+						{3,"NotAvailable"},
+						{1,"ShiftInProcess"},
+						{0,"ShiftIsNotInProcess"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Trns.Trq.Cnvrtr.Lckp.Trnstn.In.Prcess",// generic_name
+					6,// bit_position
+					2,// 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
+					{
+						{2,"Error"},
+						{3,"NotAvailable"},
+						{1,"TransitionIsInProcess"},
+						{0,"TransitionIsNotInProcess"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Trns.Trque.Converter.Lockup.Engaged",// generic_name
+					2,// bit_position
+					2,// 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
+					{
+						{2,"Error"},
+						{3,"NotAvailable"},
+						{0,"TorqueConverterLockupDisengaged"},
+						{1,"TorqueConverterLockupEngaged"}
+					},// states
+					true,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					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{"j1939",61444,"EEC1",8,8,frequency_clock_t(5.00000f),true,
+			{ // beginning signals vector
+				{std::make_shared<signal_t> (signal_t{
+					"Actl.Eng.Prcnt.Trque.High.Resolution",// generic_name
+					4,// bit_position
+					4,// bit_size
+					0.125000f,// factor
+					0.00000f,// offset
+					0,// min_value
+					0,// max_value
+					frequency_clock_t(0.00000f),// frequency
+					true,// send_same
+					false,// force_send_changed
+					{
+						{0,"0000"},
+						{1,"0125"},
+						{7,"0875"},
+						{8,"1111NotAvailable"}
+					},// states
+					false,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"%"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Actual.Eng.Percent.Torque",// generic_name
+					16,// bit_position
+					8,// bit_size
+					1.00000f,// factor
+					-125.000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"%"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Drivers.Demand.Eng.Percent.Torque",// generic_name
+					8,// bit_position
+					8,// bit_size
+					1.00000f,// factor
+					-125.000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"%"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Eng.Demand.Percent.Torque",// generic_name
+					56,// bit_position
+					8,// bit_size
+					1.00000f,// factor
+					-125.000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"%"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Eng.Speed",// generic_name
+					24,// bit_position
+					16,// bit_size
+					0.125000f,// 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
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					"rpm"// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Eng.Starter.Mode",// generic_name
+					48,// 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
+					{
+						{9,"1011Reserved"},
+						{14,"error"},
+						{15,"notAvailable"},
+						{0,"startNotRqed"},
+						{2,"starterActiveGearEngaged"},
+						{1,"starterActiveGearNotEngaged"},
+						{12,"starterInhibitedReasonUnknown"},
+						{3,"strtFnshdStrtrNtActvAftrHvngBnA"},
+						{6,"strtrInhbtdDTDrvlnEnggdOthrTrns"},
+						{5,"strtrInhbtdDTEngNtReadyForStart"},
+						{7,"strtrInhbtdDToActiveImmobilizer"},
+						{4,"strtrInhbtdDToEngAlreadyRunning"},
+						{8,"strtrInhbtdDueToStarterOvertemp"}
+					},// states
+					false,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Eng.Torque.Mode",// generic_name
+					0,// 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
+					{
+						{7,"ABS control"},
+						{5,"ASR control"},
+						{1,"Accelerator pedal/operator selec"},
+						{10,"Braking system"},
+						{2,"Cruise control"},
+						{9,"High speed governor"},
+						{0,"Low idle governor/no request (de"},
+						{15,"Not available"},
+						{3,"PTO governor"},
+						{11,"Remote accelerator"},
+						{4,"Road speed governor"},
+						{8,"Torque limiting"},
+						{6,"Transmission control"}
+					},// states
+					false,// writable
+					decoder_t::decode_state,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					static_cast<sign_t>(0),// signed
+					-1,// bit_sign_position
+					""// unit
+				})},
+				{std::make_shared<signal_t> (signal_t{
+					"Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl",// generic_name
+					40,// 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
+					false,// writable
+					nullptr,// decoder
+					nullptr,// encoder
+					false,// received
+					std::make_pair<bool, int>(false, 0),// multiplex
+					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{