Skip to content

Allow ModbusBaseServer to directly accept a SimCore instance as context #2967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
km-64 wants to merge 2 commits into from
+9 −6
Closed

Allow ModbusBaseServer to directly accept a SimCore instance as context #2967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb49763
Allow ModbusBaseServer do directly accept a SimCore instance as context
km-64 Jul 16, 2026
0424f51
Update context type annotation in ModbusBaseServer subclasses
km-64 Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pymodbus/server/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ModbusBaseServer(ModbusProtocol):
def __init__(
self,
params: CommParams,
context: ModbusServerContext | SimDevice | list[SimDevice],
context: ModbusServerContext | SimDevice | list[SimDevice] | SimCore,
ignore_missing_devices: bool,
broadcast_enable: bool,
identity: ModbusDeviceIdentification | None,
Expand All @@ -46,7 +46,9 @@ def __init__(
for func in custom_pdu:
self.decoder.register(func)
self.context: ModbusServerContext | SimCore
if not isinstance(context, ModbusServerContext):
if isinstance(context, SimCore):
self.context = context
elif not isinstance(context, ModbusServerContext):
self.context = SimCore(context)
elif context.simdevices:
self.context = SimCore(context.simdevices)
Expand Down
9 changes: 5 additions & 4 deletions pymodbus/server/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from ..pdu import ModbusPDU
from ..pdu.device import ModbusDeviceIdentification
from ..simulator import SimDevice
from ..simulator.simcore import SimCore
from ..transport import CommParams, CommType
from .base import ModbusBaseServer

Expand All @@ -22,7 +23,7 @@ class ModbusTcpServer(ModbusBaseServer):

def __init__(
self,
context: ModbusServerContext | SimDevice | list[SimDevice],
context: ModbusServerContext | SimDevice | list[SimDevice] | SimCore,
*,
framer=FramerType.SOCKET,
identity: ModbusDeviceIdentification | None = None,
Expand Down Expand Up @@ -86,7 +87,7 @@ class ModbusTlsServer(ModbusTcpServer):

def __init__(
self,
context: ModbusServerContext | SimDevice | list[SimDevice],
context: ModbusServerContext | SimDevice | list[SimDevice] | SimCore,
*,
framer=FramerType.TLS,
identity: ModbusDeviceIdentification | None = None,
Expand Down Expand Up @@ -148,7 +149,7 @@ class ModbusUdpServer(ModbusBaseServer):

def __init__(
self,
context: ModbusServerContext | SimDevice | list[SimDevice],
context: ModbusServerContext | SimDevice | list[SimDevice] | SimCore,
*,
framer=FramerType.SOCKET,
identity: ModbusDeviceIdentification | None = None,
Expand Down Expand Up @@ -209,7 +210,7 @@ class ModbusSerialServer(ModbusBaseServer):

def __init__(
self,
context: ModbusServerContext | SimDevice | list[SimDevice],
context: ModbusServerContext | SimDevice | list[SimDevice] | SimCore,
*,
framer: FramerType = FramerType.RTU,
identity: ModbusDeviceIdentification | None = None,
Expand Down