Merge branch 'MTC' into develop

This commit is contained in:
Samuele E. Locatelli
2019-11-22 17:10:42 +01:00
3 changed files with 31 additions and 4 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ BLINK_FILT=0
; attenzione memoria sempre base BYTE (1604 DW --> 6416...)
PZCOUNT_MODE=STD.DM20.2
DISABLE_PZCOUNT=TRUE
ENABLE_DYN_DATA=TRUE
ENABLE_DYN_DATA=FALSE
FORCE_DYN_DATA=TRUE
; conf parametri memoria READ/WRITE
+29 -2
View File
@@ -573,9 +573,36 @@ namespace IOB_WIN
if (utils.CRB("enableContapezzi"))
{
// cerco parametro contapezzi...
string currPzCount = "";
string currPartId = "";
string currProg = "";
try
{
var currDataItem = dataItemMem["Path_01_PZ_TOT"];
currPzCount = currDataItem.value;
}
catch
{ }
try
{
var currDataItem = dataItemMem["Path_01_PartId"];
currPartId = currDataItem.value;
}
catch
{ }
try
{
var currDataItem = dataItemMem["Path_01_CurrProg"];
currProg = currDataItem.value;
}
catch
{ }
var exeMode = dataItemMem["Path_01_EXE_MODE"];
// se ho un contapezzi... processo...
if (!string.IsNullOrEmpty(currPzCount))
{
int.TryParse(currPzCount, out lastCountCNC);
}
#if false
try
{
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=543']) {
withEnv(['NEXT_BUILD_NUMBER=544']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'