Fix problem with current configuration (#1581)

trikset · Sep 12, 2022 · f02e280 · f02e280
1 parent 6224f82
commit f02e280
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/plugins/robots/generators/generatorBase/src/generatorFactoryBase.cpp b/plugins/robots/generators/generatorBase/src/generatorFactoryBase.cpp
@@ -425,8 +425,15 @@ QString GeneratorFactoryBase::isrHooksCode()
 QMap<PortInfo, DeviceInfo> GeneratorFactoryBase::currentConfiguration() const
 {
 	auto worldModel = mRepo.metaInformation("worldModel").toString();
-	const auto id = mRobotModelManager.model().robotId();
-	auto robotConfig = RobotModelUtils::deserializeFromWorldModel(worldModel)[id];
+	const auto curId = mRobotModelManager.model().robotId();
+	auto robotsConfig = RobotModelUtils::deserializeFromWorldModel(worldModel);
+	QMap<PortInfo, DeviceInfo> robotConfig;
+	for (const auto &id : robotsConfig.keys()) {
+		if (id.startsWith(curId.left(3))) {
+			robotConfig = robotsConfig[id];
+			break;
+		}
+	}
 	// At the moment we have sensors configuration from widget-configurer. We must also add here non-configurable
 	// by user devices (like encoders, displays and so on).
 	for (const PortInfo &port : mRobotModelManager.model().availablePorts()) {