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

Merge branch 'release/FixOpcUaRebootToEmerg02'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-05-16 09:40:59 +02:00
parent 5d83283178 c987caf75e
commit cd49fe747c
3 changed files with 46 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini
+4 -2
View File
@@ -74,9 +74,11 @@ VETO_SEND_SNAPSHOT=3
;NO_PING=TRUE
; conf aree allarme
ALARM_CONF=CIMOLAI_01_alarm.json
ALARM_CONF=BAGLIETTO_CIMOLAI_01_alarm.json
;ALARM_CONF=CIMOLAI_01_alarm.json
; conf parametri memoria READ/WRITE
OPC_PARAM_CONF=CIMOLAI_01.json
OPC_PARAM_CONF=BAGLIETTO_CIMOLAI_01.json
;OPC_PARAM_CONF=CIMOLAI_01.json
[BRANCH]
NAME=master
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+40 -96
View File
@@ -322,82 +322,34 @@
</Compile>
<Compile Include="UAClient.cs" />
<Compile Include="utils.cs" />
<None Include="DATA\CONF\IMI_PAMA_392.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_PAMA_392.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_PAMA_392.ini" />
<None Include="DATA\CONF\IMI_PAMA_392.json" />
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.ini" />
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_02.json" />
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.ini" />
<None Include="DATA\CONF\IMI_SOITAAB_Z2342_01.json" />
<None Include="DATA\CONF\PIZ10.ini" />
<None Include="DATA\CONF\PIZ10.json" />
<None Include="DATA\CONF\PIZ10_alarm.json" />
<None Include="DATA\CONF\PIZ10_MBlock.json" />
<None Include="DATA\CONF\Tend_FIMAT_01.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\Tend_FIMAT_01.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\Tend_FIMAT_01_alarm.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\Tend_FIMAT_01_MBlock.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_02.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_02.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_02_MBlock.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_01.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_01.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_01_alarm.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_VER_01_MBlock.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_02.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_02.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_02_MBlock.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_01_MBlock.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_01_alarm.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_01.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IMI_RIMOR_SAB_01.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\Tend_FIMAT_01.ini" />
<None Include="DATA\CONF\Tend_FIMAT_01.json" />
<None Include="DATA\CONF\Tend_FIMAT_01_alarm.json" />
<None Include="DATA\CONF\Tend_FIMAT_01_MBlock.json" />
<None Include="DATA\CONF\IMI_RIMOR_VER_02.ini" />
<None Include="DATA\CONF\IMI_RIMOR_VER_02.json" />
<None Include="DATA\CONF\IMI_RIMOR_VER_02_MBlock.json" />
<None Include="DATA\CONF\IMI_RIMOR_VER_01.ini" />
<None Include="DATA\CONF\IMI_RIMOR_VER_01.json" />
<None Include="DATA\CONF\IMI_RIMOR_VER_01_alarm.json" />
<None Include="DATA\CONF\IMI_RIMOR_VER_01_MBlock.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02.ini" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_02_MBlock.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_01_MBlock.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_01_alarm.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_01.json" />
<None Include="DATA\CONF\IMI_RIMOR_SAB_01.ini" />
<None Include="DATA\PROC\setupConsumi.json" />
<None Include="Tools\ExcImport.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -406,8 +358,12 @@
<None Include="DATA\CONF\1033.ini" />
<None Include="DATA\CONF\3026-MBus.ini" />
<None Include="DATA\CONF\3026-MBus.json" />
<None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01.ini" />
<None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01.json" />
<None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3026.ini" />
<None Include="DATA\CONF\3026.json" />
<None Include="DATA\CONF\GIACO_CEDAX_001.ini" />
@@ -424,7 +380,9 @@
<None Include="DATA\CONF\GIACO_CEDAX_003.json" />
<None Include="DATA\CONF\GIACO_CEDAX_003_alarm.json" />
<None Include="DATA\CONF\GIACO_CEDAX_003_MBlock.json" />
<None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01_alarm.json" />
<None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\GIACO_CENTERFRIGO_MBlock.json" />
<None Include="DATA\CONF\GIACO_CENTERFRIGO_alarm.json" />
<None Include="DATA\CONF\GIACO_CENTERFRIGO.ini" />
@@ -593,9 +551,7 @@
<None Include="DATA\CONF\PIZ08.ini" />
<None Include="DATA\CONF\PIZ08.json" />
<None Include="DATA\CONF\PIZ08_alarm.json" />
<None Include="DATA\CONF\PING.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PING.ini" />
<None Include="DATA\CONF\PIZ09.ini" />
<None Include="DATA\CONF\PIZ09.json" />
<None Include="DATA\CONF\PIZ09_alarm.json" />
@@ -613,12 +569,8 @@
<None Include="DATA\CONF\STEL_200.json" />
<None Include="DATA\CONF\Tend_250_53.ini" />
<None Include="DATA\CONF\Tend_250_53.json" />
<None Include="DATA\CONF\TEST.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\TEST.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\TEST.ini" />
<None Include="DATA\CONF\TEST.json" />
<None Include="DATA\CONF\SIMUL_05.json" />
<None Include="DATA\CONF\SIMUL_06.json" />
<None Include="DATA\CONF\SIMUL_07.json" />
@@ -683,15 +635,11 @@
<None Include="DATA\CONF\3012.ini" />
<None Include="DATA\CONF\FP_R7.ini" />
<None Include="DATA\CONF\FP_R6.ini" />
<None Include="DATA\CONF\OSAI.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\OSAI.ini" />
<None Include="DATA\CONF\GT547.ini" />
<None Include="DATA\CONF\4000.ini" />
<None Include="DATA\CONF\SIMUL_04.ini" />
<None Include="DATA\CONF\SIMUL_03.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_03.ini" />
<None Include="DATA\CONF\L014.ini" />
<None Include="DATA\CONF\L017.ini" />
<None Include="DATA\CONF\MAIN.ini">
@@ -714,12 +662,8 @@
</None>
<None Include="DATA\CONF\EM63.ini" />
<None Include="DATA\CONF\EM63.json" />
<None Include="DATA\CONF\WPS.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\WPS.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\WPS.ini" />
<None Include="DATA\CONF\WPS.json" />
<None Include="DATA\DAT\PersistData.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN-NEXT/postBuildTgt.bat
+2 -2
View File
@@ -59,11 +59,11 @@ REM echo Debug remoto: effettuo robocopy sync (verificare remote per cliente)
REM FINASSI
REM ROBOCOPY . \\10.150.0.1\Steamware\IOB-WIN-NEXT-DEB /MIR
REM Baglietto
REM ROBOCOPY . \\192.168.60.15\Steamware\IOB-WIN-NEXT-DEB /MIR
ROBOCOPY . \\192.168.60.15\Steamware\IOB-WIN-NEXT-DEB /MIR
REM GIACOVELLI LOCOROTONDO
REM ROBOCOPY . \\192.168.1.93\Steamware\IOB-WIN-NEXT-DEB /MIR
REM IMI Remosa
ROBOCOPY . \\192.168.0.12\Steamware\IOB-WIN-NEXT-DEB /MIR
REM ROBOCOPY . \\192.168.0.12\Steamware\IOB-WIN-NEXT-DEB /MIR
REM IOB-WIN-SIM
REM ROBOCOPY . \\IOB-WIN-SIMULA\Steamware\IOB-WIN-NEXT-DEB /MIR