Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inizio modifica x contapezzi area D x TORNOS

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-04-27 15:01:21 +02:00
parent 780c989894
commit bbf9cd29a7
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/App.config
+1 -1
View File
@@ -12,7 +12,7 @@
<add key="enableOverrides" value="true" />
<add key="enableDynData" value="false" />
<add key="enableSysInfo" value="false" />
<add key="doStartMemDump" value="true" />
<add key="doStartMemDump" value="false" />
<add key="doSampleMemory" value="false" />
<add key="basePrgMemPath" value="CNCMEMUSER" />
<!--gestione TIMERS e periodi multipli x thread lenti-->
IOB-WIN/DATA/CONF/3002.ini
+5 -5
View File
@@ -60,11 +60,11 @@ BLINK_FILT=0
[OPTPAR]
;PZCOUNT_MODE=STD|BIT.indice
PZCOUNT_MODE=BIT.X7.1
PZ_CAD_MADDR=1602
PZ_REQ_MADDR=1603
PZ_DONE_MADDR=1604
PZ_GTOT_MADDR=1605
PZCOUNT_MODE=STD.D.DW.1604 ;contapezzi.area.indice.tipo_mem
PZ_CAD_MADDR=1602; cad
PZ_REQ_MADDR=1603; pz richiesti (DW)
PZ_DONE_MADDR=1604; pz fatti
PZ_GTOT_MADDR=1605; pz tot macchina
[BRANCH]
NAME=develop
IOB-WIN/IobFanuc.cs
+27 -7
View File
@@ -644,14 +644,34 @@ namespace IOB_WIN
{
if (currIobConf.optPar["PZCOUNT_MODE"].StartsWith("STD"))
{
// var di appoggio
object output = new object();
// recupero parametro...
int cntAddr = 6711;
int.TryParse(currIobConf.optPar["PZCOUNT_MODE"].Replace("STD.PAR.", ""), out cntAddr);
// processo parametro contapezzi (lavorati)
stopwatch.Restart();
FANUC_ref.F_RW_Param_Integer(false, cntAddr, 3, ref output);
if (utils.CRB("recTime")) TimingData.addResult(currIobConf.codIOB, string.Format("R{0}-PAR", 4), stopwatch.ElapsedTicks);
int cntAddr = 0;
// inizio verifica area memoria/parametro levando prima aprte codice
string memAddr = currIobConf.optPar["PZCOUNT_MODE"].Replace("STD.", "");
// verifico se si tratta di lettura parametro...
if (memAddr.StartsWith("PAR."))
{
// recupero parametro...
int.TryParse(memAddr.Replace("PAR.", ""), out cntAddr);
if (cntAddr == 0) cntAddr = 6711;
// processo parametro contapezzi (lavorati)
stopwatch.Restart();
FANUC_ref.F_RW_Param_Integer(false, cntAddr, 3, ref output);
if (utils.CRB("recTime")) TimingData.addResult(currIobConf.codIOB, string.Format("R{0}-PAR", 4), stopwatch.ElapsedTicks);
}
// altrimenti se legge da area memoria specifica leggo da li...
else
{
// in primis AREA di memoria...
string area = memAddr.Substring(0, memAddr.IndexOf("."));
memAddr = memAddr.Replace(area + ".", "");
// poi controllo tipo di memoria
string tipo = "";
// infine recupero indirizzo...
}
// salvo ultimo conteggio rilevato
Int32.TryParse(output.ToString(), out lastCountCNC);
stopwatch.Stop();
Jenkinsfile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=259']) {
withEnv(['NEXT_BUILD_NUMBER=260']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'