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

Merge branch 'release/UpdateHamPizzaferriNewModbus'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-12-10 15:43:09 +01:00
parent 33481fa554 fa470f88e1
commit 08261f80f7
7 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+2 -1
View File
@@ -44,6 +44,7 @@ CLI_INST=SteamWareSim
;STARTLIST=FINASSI_OMP_01
;STARTLIST=BAGLIETTO_CIMOLAI_01
;STARTLIST=SIMUL_01
STARTLIST=GIACO_SAIM_003
;STARTLIST=GIACO_SAIM_003
STARTLIST=PIZ09
MAXCNC=10
IOB-WIN-NEXT/DATA/CONF/PIZ04.ini
+9 -5
View File
@@ -10,7 +10,6 @@ MODEL=HAM
[CNC]
IP=hampizzaferri.dyndns.org
;IP=84.33.93.182
PORT=502
[SERVER]
@@ -25,11 +24,16 @@ CMDADV1=?valore=
CMDREBO=/IOB/sendReboot?idxMacchina=
[MEMORY]
ADDR_READ=40001
ADDR_WRITE=40401
SIZE_READ=34
ADDR_READ=40000
ADDR_WRITE=40400
SIZE_READ=64
SIZE_WRITE=358
HR_BASE_ADDR=40000
;DELTA_BASE=1
DELTA_BASE=0
INDEX_LUT_CORR=-1
[BLINK]
;MAX_COUNTER_BLINK = 30
@@ -59,7 +63,7 @@ FORCE_DYN_DATA=TRUE
DELTA_VAL=0.1
; clock base (da 10ms)
timerIntMs=100
timerIntMs=150
MAX_ERROR_READ=10
IOB-WIN-NEXT/DATA/CONF/PIZ05.ini
+9 -4
View File
@@ -24,11 +24,16 @@ CMDADV1=?valore=
CMDREBO=/IOB/sendReboot?idxMacchina=
[MEMORY]
ADDR_READ=40001
ADDR_WRITE=40401
SIZE_READ=34
ADDR_READ=40000
ADDR_WRITE=40400
SIZE_READ=64
SIZE_WRITE=358
HR_BASE_ADDR=40000
;DELTA_BASE=1
DELTA_BASE=0
INDEX_LUT_CORR=-1
[BLINK]
;MAX_COUNTER_BLINK = 30
@@ -65,7 +70,7 @@ MAX_ERROR_READ=10
; conf parametri memoria READ/WRITE
PARAM_CONF=PIZ05.json
NO_PING=TRUE
NO_PING=FALSE
; conf blocchi memoria x READ
MEM_BLOCK=PIZ05_MBlock.json
; conf aree allarme
IOB-WIN-NEXT/DATA/CONF/PIZ09.ini
+9 -4
View File
@@ -24,11 +24,16 @@ CMDADV1=?valore=
CMDREBO=/IOB/sendReboot?idxMacchina=
[MEMORY]
ADDR_READ=40001
ADDR_WRITE=40401
SIZE_READ=34
ADDR_READ=40000
ADDR_WRITE=40400
SIZE_READ=64
SIZE_WRITE=358
HR_BASE_ADDR=40000
;DELTA_BASE=1
DELTA_BASE=0
INDEX_LUT_CORR=-1
[BLINK]
;MAX_COUNTER_BLINK = 30
@@ -65,7 +70,7 @@ MAX_ERROR_READ=10
; conf parametri memoria READ/WRITE
PARAM_CONF=PIZ09.json
NO_PING=TRUE
NO_PING=FALSE
; conf blocchi memoria x READ
MEM_BLOCK=PIZ09_MBlock.json
; conf aree allarme
IOB-WIN-NEXT/DATA/CONF/PIZ09_MBlock.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"ReadBlocks": {
"40001": 64,
"40421": 64,
"40901": 8
}
"ReadBlocks": {
"40000": 64,
"40420": 64,
"40900": 8
}
}
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+12 -4
View File
@@ -508,10 +508,18 @@
<None Include="DATA\CONF\PING.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ09.ini" />
<None Include="DATA\CONF\PIZ09.json" />
<None Include="DATA\CONF\PIZ09_alarm.json" />
<None Include="DATA\CONF\PIZ09_MBlock.json" />
<None Include="DATA\CONF\PIZ09.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ09.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ09_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ09_MBlock.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIM_PIZ08.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN-NEXT/IobModbusTCP.cs
+8 -1
View File
@@ -155,6 +155,11 @@ namespace IOB_WIN_NEXT
/// </summary>
private int deltaBase { get; set; } = 0;
/// <summary>
/// Valore da gestire come delta degli index x lettura LUT
/// </summary>
private int indexLutCorr { get; set; } = 0;
/// <summary>
/// Indica se usare gli indirizzi estesi per ogni blocco: false = 0...10'000 true =
/// 0...65'536 (= xFFFF)
@@ -923,6 +928,7 @@ namespace IOB_WIN_NEXT
parametri.holdRegBaseAddr = fIni.ReadInteger("MEMORY", "HR_BASE_ADDR", 40001);
// valore delta base e shift
deltaBase = fIni.ReadInteger("MEMORY", "DELTA_BASE", 0);
indexLutCorr = fIni.ReadInteger("MEMORY", "INDEX_LUT_CORR", 0);
// verifico eventuale parametro memoria estesa (non 0...10'000 ma 0...xFFFF=65536)
modbusExtReg = fIni.ReadBoolean("MEMORY", "MODBUS_EXT_REG");
// salvo vettori memoria...
@@ -1519,7 +1525,7 @@ namespace IOB_WIN_NEXT
case modBusAddrType.HoldingRegister:
if (useLUT)
{
int lutAddress = 40000 + item.Value.index + deltaBase;
int lutAddress = 40000 + item.Value.index + deltaBase + indexLutCorr;
// se size = 1 --> devo cambiare modo recupero
if (item.Value.size == 1)
{
@@ -1558,6 +1564,7 @@ namespace IOB_WIN_NEXT
lgError($"Errore in lettura da HoldingRegisterLUT per indirizzo {lutAddress} | item {item.Key}{Environment.NewLine}{exc}");
}
}
// altrimenti cerco swappando a -1...
}
}
else