Vers 1903 x fix poweron delle macchine TORRI

This commit is contained in:
Samuele E. Locatelli
2019-03-12 21:30:20 +01:00
parent d28759af8c
commit bb1b75aa8b
4 changed files with 16 additions and 2 deletions
Binary file not shown.
+2
View File
@@ -74,6 +74,8 @@
<!--conf x FANUC-->
<add key="ClientSettingsProvider.ServiceUri" value=""/>
<add key="pzCountDelay" value="2000"/>
<!--conf x SIEMENS-->
<add key="powerOnByConn" value="true"/>
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+13 -1
View File
@@ -71,6 +71,18 @@ namespace IOB_WIN
B_input = 0;
// TORRI: leggo i primi 8 bit hard coded...
int byteSem = RawInput[0];
// Verifico se usare powerOn by connessione... SE funziona diventerà SENZA CONF di default...
if (utils.CRB("powerOnByConn"))
{
// azzero powerOn...
byteSem &= ~(1 << 0);
// bit 0 (powerOn) imposto a 1 SE connected...
if (currPLC.IsConnected)
{
byteSem += (1 << 0);
}
}
// azzero i bit NON gestiti (2-5-6-7)
byteSem &= ~(1 << 2);
byteSem &= ~(1 << 5);
@@ -78,7 +90,7 @@ namespace IOB_WIN
byteSem &= ~(1 << 7);
// leggo bit 701.4 e lo porto al bit 5 --> ciclo test/accensione/spegnimento
if ((RawInput[1] & (1 << 4)) != 0) //se RawInput[1] & 16-- > 5° bit-- > TEST
{
{
byteSem += (1 << 5);
}
// salvo infine variabile bit x invio
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=362']) {
withEnv(['NEXT_BUILD_NUMBER=363']) {
// 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 = 'MAPO-IOB-WIN'