Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into IobMan

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-27 11:35:52 +01:00
parent 98a8da0ca1 898cf22c4a
commit 2cecdda220
3 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/DATA/CONF/WPS.ini
+2 -1
View File
@@ -14,7 +14,8 @@ IP=10.74.82.253
;IP=10.82.74.1
[SERVER]
MPIP=http://192.168.1.7
MPIP=http://10.74.82.218
;MPIP=http://192.168.1.7
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
IOB-WIN/IobWPS.cs
+31 -21
View File
@@ -61,7 +61,7 @@ namespace IOB_WIN
public IobWPS(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("INIT IobWPS");
reloadAdapterConf();
//reloadAdapterConf();
}
/// <summary>
/// Ricarica conf adapter...
@@ -149,7 +149,9 @@ namespace IOB_WIN
try
{
var t = TaskEx.Run(() => startDriver());
//t.Wait();
t.Wait();
lgInfo("Completato start driver");
// vecchia modalità sincrona
//startDriver();
@@ -184,7 +186,7 @@ namespace IOB_WIN
else
{
lgInfo("Starting FIREFOX Driver");
// preparo opzione headless x CHROME
// preparo opzione headless x FIREFOX
var o = new FirefoxOptions();
o.AddArgument("-headless");
o.SetPreference("app.update.auto", false);
@@ -282,33 +284,41 @@ namespace IOB_WIN
/// </summary>
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori(ref currDispData);
// init a zero...
B_input = 0;
// ciclo!
try
{
string cKey = "";
string cVal = "";
// IPOTESI: un UNICO oggetto decodifica status
if (monitoredItems.Status.Count == 1)
// controllo SE il driver SIA attivo...
if (driver != null)
{
var item = monitoredItems.Status[0];
// cerco elemento indicato
element = driver.FindElement(By.Id(item.val));
cKey = element.Text;
// verifico se mancasse il mapping...
if (!item.codeMapping.ContainsKey(cKey))
string cKey = "";
string cVal = "";
// IPOTESI: un UNICO oggetto decodifica status
if (monitoredItems.Status.Count == 1)
{
processUnknStatus(cKey);
}
else
{
// ora decodifico da variabile status a valore secondo impostazione "codeMapping"
cVal = item.codeMapping[cKey];
B_input = int.Parse(cVal, System.Globalization.NumberStyles.HexNumber);
var item = monitoredItems.Status[0];
// cerco elemento indicato
element = driver.FindElement(By.Id(item.val));
cKey = element.Text;
// verifico se mancasse il mapping...
if (!item.codeMapping.ContainsKey(cKey))
{
processUnknStatus(cKey);
}
else
{
// ora decodifico da variabile status a valore secondo impostazione "codeMapping"
cVal = item.codeMapping[cKey];
B_input = int.Parse(cVal, System.Globalization.NumberStyles.HexNumber);
currDispData.semIn = Semaforo.SV;
}
}
}
else
{
lgError("Errore: driver non pronto (null)");
}
// riporto bitmap...
reportRawInput(ref currDispData);
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=676']) {
withEnv(['NEXT_BUILD_NUMBER=677']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'