From d86d5937ffeeb156a8661d84f635ddeb20e7260f Mon Sep 17 00:00:00 2001
From: aschwinn <al.schwinn@gsi.de>
Date: Tue, 18 Jul 2017 16:23:46 +0200
Subject: [PATCH] revert of Bug 1445 - move generated code for fesa-class into
"generated"
---
silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py | 2 +-
silecs-codegen/src/xml/migration/2_0_xto2_1_x.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py b/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py
index 5ef9b32..7f76afb 100644
--- a/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py
+++ b/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py
@@ -319,7 +319,7 @@ cPart2 = """
// Retrieve the PLC related to the current FESA device
// (from 'plcHostName' FESA field defined on that purpose).
- Silecs::PLC* pPLC = pCluster_->getPLC(pDevice->plcHostName.get(),pDevice->parameterFile.get());
+ Silecs::PLC* pPLC = pCluster_->getPLC(pDevice->plcHostName.get());
// Update the PLC Slave registers from related FESA fields just before synchronising done at connection time
setPLCSlaveRegisters(pPLC, serviceLocator);
diff --git a/silecs-codegen/src/xml/migration/2_0_xto2_1_x.py b/silecs-codegen/src/xml/migration/2_0_xto2_1_x.py
index defb913..4c9dbdd 100644
--- a/silecs-codegen/src/xml/migration/2_0_xto2_1_x.py
+++ b/silecs-codegen/src/xml/migration/2_0_xto2_1_x.py
@@ -41,8 +41,6 @@ class Migration(MigrationBase):
contextFesa = self._parse(fesaDocument)
modified |= removeFesaConfigurationFieldParameterFile(contextFesa)
self.updateFESAMakeSpecific()
-
-
return modified
def migrateDeployUnit(self, context, projectDir ):
--
GitLab