Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix anche x path 02 dei nuovi naming MTC/OPC-UA

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-02-14 12:07:39 +01:00
parent a5c6c2447d
commit 15eaa3d5eb
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=377']) {
withEnv(['NEXT_BUILD_NUMBER=380']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
MTC_Adapter/SCMA/AdapterGeneric.cs
+33 -14
View File
@@ -3530,8 +3530,7 @@ namespace SCMA
// switch su RUN mode...
string runMode = "";
int currRunMode = 0;
int currRunMode = 0;
if (STRB_DW2.HasFlag(StFlag32.B04))
{
currRunMode = (int)MtcRunMode.AUTOMATIC;
@@ -3643,56 +3642,76 @@ namespace SCMA
// switch su RUN mode...
string runMode = "";
int currRunMode = 0;
if (STRB_DW2.HasFlag(StFlag32.B17))
{
runMode = "AUTOMATIC";
currRunMode = (int)MtcRunMode.AUTOMATIC;
}
else if (STRB_DW2.HasFlag(StFlag32.B18))
{
runMode = "EDIT";
currRunMode = (int)MtcRunMode.EDIT;
}
else if (STRB_DW2.HasFlag(StFlag32.B19))
{
runMode = "MANUAL_DATA_INPUT";
currRunMode = (int)MtcRunMode.MANUAL_DATA_INPUT;
}
else if (STRB_DW2.HasFlag(StFlag32.B20))
{
runMode = "MANUAL";
currRunMode = (int)MtcRunMode.MANUAL;
}
else if (STRB_DW2.HasFlag(StFlag32.B21))
{
runMode = "SEMI_AUTO";
currRunMode = (int)MtcRunMode.SEMI_AUTO;
}
// traduco...
if (currGateway.protocollo == gwProtocol.SOURS)
{
runMode = ((OpcUaPathMode)currRunMode).ToString();
}
else
{
runMode = ((MtcRunMode)currRunMode).ToString();
}
// switch su EXE mode...
string exeMode = "";
int currExeMode = 0;
if (STRB_DW2.HasFlag(StFlag32.B22))
{
exeMode = "ACTIVE";
currExeMode = (int)MtcExeMode.ACTIVE;
}
else if (STRB_DW2.HasFlag(StFlag32.B23))
{
exeMode = "READY";
currExeMode = (int)MtcExeMode.READY;
}
else if (STRB_DW2.HasFlag(StFlag32.B24))
{
exeMode = "STOPPED";
currExeMode = (int)MtcExeMode.STOPPED;
}
else if (STRB_DW2.HasFlag(StFlag32.B25))
{
exeMode = "FEED_HOLD";
currExeMode = (int)MtcExeMode.FEED_HOLD;
}
else if (STRB_DW2.HasFlag(StFlag32.B26))
{
exeMode = "OPTIONAL_STOP";
currExeMode = (int)MtcExeMode.OPTIONAL_STOP;
}
else if (STRB_DW2.HasFlag(StFlag32.B27))
{
exeMode = "PROGRAM_STOPPED";
currExeMode = (int)MtcExeMode.PROGRAM_STOPPED;
}
else if (STRB_DW2.HasFlag(StFlag32.B28))
{
exeMode = "PROGRAM_COMPLETED";
currExeMode = (int)MtcExeMode.PROGRAM_COMPLETED;
}
// traduco...
if (currGateway.protocollo == gwProtocol.SOURS)
{
exeMode = ((OpcUaPathStatus)currExeMode).ToString();
}
else
{
exeMode = ((MtcExeMode)currExeMode).ToString();
}
// inizializzo SEMPRE a vuoto...