From 9e23caa4c56259044604c38f107f7c637001b846 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 6 Jan 2021 18:30:03 -0500 Subject: Restore /etc/dev-mapping.conf support Add back the ini-config and config-parser code that existed previously, and use it in binding init to over-ride the device mapping from the controller JSON if /etc/dev-mapping.conf exists. This restores the documented behavior, and is needed for the existing AGL demo platform support and soon CI. Additionally: - Add code to validate the active_message_set, diagnostic_bus, and bus device mapping configuration values. - The above required moving plugin loading before the configuration callback in the controller configuration, but this change seems rational in that everything required by the generated plugin code is already initialized before then, and it makes validating the configuration possible without adding an extra callback. - Add logging of the used CAN bus to device mappings at info level to ease debugging any future issues. - Tweak the log level of the missing configuration file message to info from error, since it is a legitimate mode of operation if relying on the default bus values in the controller JSON. Bug-AGL: SPEC-3755 Signed-off-by: Scott Murray Change-Id: I440f5e0fc85be41f7c4c1f47d824a403525a18f9 --- low-can-binding/can/message-definition.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'low-can-binding/can/message-definition.cpp') diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp index dab502af..051c2d3c 100644 --- a/low-can-binding/can/message-definition.cpp +++ b/low-can-binding/can/message-definition.cpp @@ -56,6 +56,10 @@ message_definition_t::message_definition_t(const std::string bus, signals_{signals} {} +const std::string message_definition_t::get_bus_name() const{ + return bus_; +} + const std::string message_definition_t::get_bus_device_name() const { return application_t::instance().get_can_bus_manager() -- cgit 1.2.3-korg