Fix gestione SIM x contapezzi

This commit is contained in:
Samuele E. Locatelli
2020-10-01 12:28:04 +02:00
parent 6e546f567a
commit f1b82b42cf
3 changed files with 4402 additions and 4401 deletions
+4398 -4398
View File
File diff suppressed because it is too large Load Diff
+3 -2
View File
@@ -338,8 +338,6 @@ namespace IOB_WIN
// di base macchina in RUN
B_input = 3;
// di base NON emergenza
B_input += (1 << 7);
/*----------------------------------------
* Simulazione segnali con priorità:
@@ -429,6 +427,9 @@ namespace IOB_WIN
// questa parte la processo SOLO SE sono in run --> B_input == 3
if (B_input == 3)
{
// di base NON emergenza
B_input += (1 << 7);
// ora controllo il resto...
if (bit3.wait <= 0)
{
// segnalo BIT
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=703']) {
withEnv(['NEXT_BUILD_NUMBER=704']) {
// 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'