From 03eb5a4e51f794a979f43bd2eea343e712d083f6 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 5 Apr 2018 11:07:22 +0200 Subject: [PATCH] levata opzione derivare poweron da semafori (errato...) --- IOB-WIN/AdapterForm.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index 70597046..b1aeb540 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -73,6 +73,14 @@ namespace IOB_WIN /// public tipoAdapter tipoScelto = tipoAdapter.DEMO; /// + /// Vendor macchina + /// + public string curVendor = ""; + /// + /// Modello macchina + /// + public string curModel = ""; + /// /// Codice IOB della macchina cui connettersi (x scegliere corretto file di conf...) /// protected string CurrIOB { get; set; } @@ -188,6 +196,8 @@ namespace IOB_WIN { // definisco e avvio tipo adapter generico tipoScelto = tipoAdapter.ND; + curVendor = "ACME"; + curModel = "NONE"; IOBConf = new IobConfiguration(); loadIobType(); displayTaskAndLog("Waiting for config file selection"); @@ -415,6 +425,9 @@ namespace IOB_WIN IniFile fIni = new IniFile(iniConfFile); + // leggo vendor e modello... + curVendor = fIni.ReadString("MACHINE", "VENDOR", "ACME"); + curModel = fIni.ReadString("MACHINE", "MODEL", "NONE"); // verifico tipo adapter tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO")); // carivo vettore parametri opzionai @@ -439,6 +452,8 @@ namespace IOB_WIN // inizializzio conf IOB IOBConf = new IobConfiguration { + vendor = curVendor, + model = curModel, tipoIob = tipoScelto, optPar = optParRead, versIOB = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(),