diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcc32532..c3be77f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -430,8 +430,8 @@ IOB-WIN:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -456,8 +456,8 @@ IOB-WIN-FANUC:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -482,8 +482,8 @@ IOB-WIN-FILE:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -508,8 +508,8 @@ IOB-WIN-FTP:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -534,8 +534,8 @@ IOB-WIN-KAWASAKI:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -560,8 +560,8 @@ IOB-WIN-MBUS:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -586,8 +586,8 @@ IOB-WIN-MITSUBISHI:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -612,8 +612,8 @@ IOB-WIN-MTC:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -638,8 +638,8 @@ IOB-WIN-NEXT:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -664,8 +664,8 @@ IOB-WIN-OMRON:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -690,8 +690,8 @@ IOB-WIN-OPC-UA:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -716,8 +716,8 @@ IOB-WIN-OSAI:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -742,8 +742,8 @@ IOB-WIN-PING:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -768,8 +768,8 @@ IOB-WIN-SIEMENS:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -794,8 +794,8 @@ IOB-WIN-SQL:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -820,8 +820,8 @@ IOB-WIN-WPS:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix @@ -846,8 +846,8 @@ IOB-WIN-WS:release: rules: - if: $CI_COMMIT_BRANCH == 'master' changes: - - $env:APP_NAME/*.cs - - $env:APP_NAME/**/*.cs + - $env:APP_NAME/*.* + - $env:APP_NAME/**/*.* when: always before_script: - *nuget-fix diff --git a/IOB-WIN-MTC/Iob/MTConn.cs b/IOB-WIN-MTC/Iob/MTConn.cs index 9ba00849..c39988da 100644 --- a/IOB-WIN-MTC/Iob/MTConn.cs +++ b/IOB-WIN-MTC/Iob/MTConn.cs @@ -1067,24 +1067,27 @@ namespace IOB_WIN_MTC.Iob if (queueInEnabCurr) { /* ----------------------------------------------------- - * bitmap MAPO, STD 54 (6 bit) - * B0: POWER_ON - * B1: RUN - * B2: pzCount - * B3: allarme - * B4: manuale - * B5: emergenza (dipende da state machine se riportare 1 = armata/premuta, vedere conf mtcParams.emergencyArmedTrue) - ----------------------------------------------------- */ - - /* ----------------------------------------------------- - * bitmap MAPO, OPZ 60 (8 bit) - * B0: POWER_ON - * B1: RUN - * B2: pzCount - * B3: allarme - * B4: manuale - * B5: emergenza (dipende da state machine se riportare 1 = armata/premuta, vedere conf mtcParams.emergencyArmedTrue) - ----------------------------------------------------- */ + * Macchine a stati ammesse: tipicamente 54 (STD) opure 60 (SE ho configurazione 6° bit) + * + * ----------------------------------- + * bitmap MAPO, STD 54 (6 bit) + * B0: POWER_ON + * B1: RUN + * B2: pzCount + * B3: allarme + * B4: manuale + * B5: emergenza (dipende da state machine se riportare 1 = armata/premuta, vedere conf mtcParams.emergencyArmedTrue) + * ----------------------------------- + * + * ----------------------------------- + * bitmap MAPO, OPZ 60 (8 bit) + * B0: POWER_ON + * B1: RUN + * B2: pzCount + * B3: allarme + * B4: manuale + * B5: emergenza (dipende da state machine se riportare 1 = armata/premuta, vedere conf mtcParams.emergencyArmedTrue) + ----------------------------------------------------- */ DateTime adesso = DateTime.Now; // controllo se non ho dati buoni da > lastCurrentMaxElapsed sec --> disconnetto