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

Fix contapezzi in new rel

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-01 12:45:37 +02:00
parent f1b82b42cf
commit 28369150f8
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobSimula.cs
+12 -12
View File
@@ -484,18 +484,6 @@ namespace IOB_WIN
// in manuale: provo split ODL
trySplitOdl();
}
else if (bit5.wait <= 0 || tcMan.alarmDelayTC)
{
// segnalo BIT
B_input += (1 << 5);
// decremento duration
bit5.duration--;
// controllo se sia scaduta la duration... in quel caso reset...
if (bit5.duration <= 0)
{
bit5 = setupSimPar("SIM_SLOW");
}
}
else if (bit2.wait <= 0)
{
// salvo nuovo contapezziPLC (incremento RAND 0..3)
@@ -568,6 +556,18 @@ namespace IOB_WIN
trySplitOdl();
}
}
else if (bit5.wait <= 0 || tcMan.alarmDelayTC)
{
// segnalo BIT
B_input += (1 << 5);
// decremento duration
bit5.duration--;
// controllo se sia scaduta la duration... in quel caso reset...
if (bit5.duration <= 0)
{
bit5 = setupSimPar("SIM_SLOW");
}
}
// se multi gestisco il bit delle tavole...
if (isMulti)
{
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=704']) {
withEnv(['NEXT_BUILD_NUMBER=705']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'