fix G1 x override
This commit is contained in:
Vendored
+1
-1
@@ -11,7 +11,7 @@ pipeline {
|
||||
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=480']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=481']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.APP_NAME = 'SCMA'
|
||||
|
||||
@@ -758,15 +758,7 @@ namespace SCMA.AdapterPLC.CMS
|
||||
{
|
||||
currFeedOver = ZRateOver;
|
||||
}
|
||||
else if (vettGCodesAct.Contains(0))
|
||||
{
|
||||
currFeedOver = RapidOver;
|
||||
}
|
||||
else if (vettGCodesAct.Contains(1))
|
||||
{
|
||||
currFeedOver = FeedRateOver;
|
||||
}
|
||||
else if (procMode == (int)OpcUaPathMode.MANUAL_JOG)
|
||||
else
|
||||
{
|
||||
currFeedOver = FeedRateOver;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user