From: Romain Forlot <romain.forlot@iot.bzh>
Date: Fri, 14 Apr 2017 13:35:40 +0000 (+0200)
Subject: Fix: wrong splitting of can_signals
X-Git-Tag: 3.99.1~166
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=402e3e3d590df79986b63d4ae9b07cc6b399d90b;p=apps%2Flow-level-can-service.git

Fix: wrong splitting of can_signals

Signals were separated by message definitions but it is unneeded and make
signals separated by message_set.

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

diff --git a/CAN-config-generator/src/main.cpp b/CAN-config-generator/src/main.cpp
index cfefed8..e0240a8 100644
--- a/CAN-config-generator/src/main.cpp
+++ b/CAN-config-generator/src/main.cpp
@@ -225,9 +225,9 @@ void generate(const std::string& header, const std::string& footer, const openxc
 		<< "	{\n";
 		std::uint32_t message_count = message_set.messages().size();
 		std::uint32_t index = 0;
+		out << "		{\n";
 		for(const openxc::can_message& m : message_set.messages())
 		{
-			out << "		{\n";
 			std::uint32_t signal_count = m.signals().size();
 			for(const openxc::signal& s : m.signals())
 			{
@@ -236,11 +236,10 @@ void generate(const std::string& header, const std::string& footer, const openxc
 				--signal_count;
 				out << '\n';
 			}
-			out << "		}";
 			if (index + 1 < message_count) out << ',';
 			++index;
-			out << '\n';
 		}
+		out << "		}\n";
 		out << "	}\n"
 			<< "	, diagnostic_messages_\n"
 			<< "	{\n"