Skip to content

Commit 3331193

Browse files
committed
Fixed mbserver.py memory synch error
1 parent 72bc26e commit 3331193

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

doc/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ c:\Qt\5.15.2\msvc2019_64\bin\qhelpgenerator.exe "ModbusServer.qhcp"
4848

4949
To check correctness of help generation Qt assistant can be used:
5050
```console
51-
c:\Qt\5.15.2\msvc2019_64\bin>assistant -collectionFile ModbusClient.qhc
52-
c:\Qt\5.15.2\msvc2019_64\bin>assistant -collectionFile ModbusServer.qhc
51+
c:\Qt\5.15.2\msvc2019_64\bin>assistant.exe -collectionFile ModbusClient.qhc
52+
c:\Qt\5.15.2\msvc2019_64\bin>assistant.exe -collectionFile ModbusServer.qhc
5353
```
5454

5555
# File System with help

src/server/python/mbServer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def _recalcheader(self, byteoffset:int, bytecount:int)->None:
118118
if self._head.changeByteCount == 0:
119119
self._head.changeByteCount = rightedge - byteoffset
120120
else:
121-
self._head.changeByteCount = self._head.changeByteOffset - byteoffset
121+
self._head.changeByteCount += self._head.changeByteOffset - byteoffset # Fixed Jan 30 2025
122122
self._head.changeByteOffset = byteoffset
123123
if self._head.changeByteOffset + self._head.changeByteCount < rightedge:
124124
self._head.changeByteCount = rightedge - self._head.changeByteOffset

src/server/resource/python/programhead.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
from mbserver import _MemoryControlBlock, _MemoryBlockBits, _MemoryBlockRegs
1919

20-
#sMemPrefix = "ModbusTools.Server.PORT1.PLC1."
21-
#sControl = sMemPrefix+"control"
22-
#sMem3x = sMemPrefix+"mem4x"
23-
#sMem4x = sMemPrefix+"mem4x"
24-
2520
_sId = _args.memid
2621

2722
_sControl = _sId + ".control"

src/server/server.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ LIBS += -L../../bin -lcore
3434
LIBS += -L../../bin -lmodbus
3535

3636
RC_ICONS = gui/icons/server.ico
37+
38+
DISTFILES += \
39+
python/mbserver.py

0 commit comments

Comments
 (0)