This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/new-ui-tool
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 704c313ff33906b695eaf43f10102754c0ad9f28
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Mon Jan 15 22:04:03 2024 +0100
chore: minor code format updates
---
.../org/apache/plc4x/java/s7/readwrite/AlarmType.java | 2 +-
.../plc4py/plc4py/drivers/modbus/ModbusConfiguration.py | 1 +
sandbox/plc4py/plc4py/drivers/modbus/ModbusConnection.py | 16 ++++++++++------
sandbox/plc4py/plc4py/drivers/modbus/ModbusDevice.py | 6 +++++-
sandbox/plc4py/plc4py/spi/generation/ReadBuffer.py | 7 +++++--
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git
a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
index 97b8fac462..3693907d2a 100644
---
a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
+++
b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
@@ -17,7 +17,7 @@
* under the License.
*/
package org.apache.plc4x.java.s7.readwrite;
-//
+
import java.util.HashMap;
import java.util.Map;
diff --git a/sandbox/plc4py/plc4py/drivers/modbus/ModbusConfiguration.py
b/sandbox/plc4py/plc4py/drivers/modbus/ModbusConfiguration.py
index 83a0d50eb6..f3d897b168 100644
--- a/sandbox/plc4py/plc4py/drivers/modbus/ModbusConfiguration.py
+++ b/sandbox/plc4py/plc4py/drivers/modbus/ModbusConfiguration.py
@@ -23,6 +23,7 @@ class ModbusConfiguration(PlcConfiguration):
"""
Specific Modbus Configuration
"""
+
def __init__(self, url):
super().__init__(url)
diff --git a/sandbox/plc4py/plc4py/drivers/modbus/ModbusConnection.py
b/sandbox/plc4py/plc4py/drivers/modbus/ModbusConnection.py
index 0aa89b8683..670ba77d14 100644
--- a/sandbox/plc4py/plc4py/drivers/modbus/ModbusConnection.py
+++ b/sandbox/plc4py/plc4py/drivers/modbus/ModbusConnection.py
@@ -48,7 +48,7 @@ class ModbusConnection(PlcConnection):
def __init__(self, config: ModbusConfiguration, transport:
Plc4xBaseTransport):
super().__init__(config)
- self._configuration : ModbusConfiguration
+ self._configuration: ModbusConfiguration
self._device: ModbusDevice = ModbusDevice(self._configuration)
self._transport: Plc4xBaseTransport = transport
@@ -64,11 +64,14 @@ class ModbusConnection(PlcConnection):
config = ModbusConfiguration(url)
loop = asyncio.get_running_loop()
connection_future = loop.create_future()
- transport = await asyncio.wait_for(TCPTransport.create(
- protocol_factory=lambda: ModbusProtocol(connection_future),
- host=config.host,
- port=config.port,
- ), 10)
+ transport = await asyncio.wait_for(
+ TCPTransport.create(
+ protocol_factory=lambda: ModbusProtocol(connection_future),
+ host=config.host,
+ port=config.port,
+ ),
+ 10,
+ )
return ModbusConnection(config, transport)
def is_connected(self) -> bool:
@@ -152,6 +155,7 @@ class ModbusDriverLoader(PlcDriverLoader):
"""
Modbus Driver Pluggy Hook Implmentation, lets pluggy find the driver by
name
"""
+
@staticmethod
@plc4py.hookimpl
def get_driver() -> Type[ModbusDriver]:
diff --git a/sandbox/plc4py/plc4py/drivers/modbus/ModbusDevice.py
b/sandbox/plc4py/plc4py/drivers/modbus/ModbusDevice.py
index bdb5c53f84..9a0157d2c1 100644
--- a/sandbox/plc4py/plc4py/drivers/modbus/ModbusDevice.py
+++ b/sandbox/plc4py/plc4py/drivers/modbus/ModbusDevice.py
@@ -121,7 +121,11 @@ class ModbusDevice:
result = message_future.result()
if isinstance(result, ModbusPDUError):
- response_items = [ResponseItem(PlcResponseCode.ACCESS_DENIED,
PlcNull(result.exception_code))]
+ response_items = [
+ ResponseItem(
+ PlcResponseCode.ACCESS_DENIED,
PlcNull(result.exception_code)
+ )
+ ]
response = PlcReadResponse(
PlcResponseCode.OK, {request.tag_names[0]: response_items}
diff --git a/sandbox/plc4py/plc4py/spi/generation/ReadBuffer.py
b/sandbox/plc4py/plc4py/spi/generation/ReadBuffer.py
index c981d5e7ef..64beca2b8e 100644
--- a/sandbox/plc4py/plc4py/spi/generation/ReadBuffer.py
+++ b/sandbox/plc4py/plc4py/spi/generation/ReadBuffer.py
@@ -150,7 +150,6 @@ class ReadBuffer(ByteOrderAware, PositionAware, ABC):
class ReadBufferByteBased(ReadBuffer):
-
def __init__(self, bb: bytearray, byte_order: ByteOrder):
if byte_order == ByteOrder.LITTLE_ENDIAN:
bb = bitarray(buffer=bb)
@@ -347,7 +346,11 @@ class ReadBufferByteBased(ReadBuffer):
self, bit_length: int = -1, logical_name: str = "",
read_function=None, **kwargs
) -> Any:
if isinstance(read_function, aenum._enum.EnumType):
- enum_return_value = read_function(ba2int(self.bb[self.position :
self.position + bit_length], signed=False))
+ enum_return_value = read_function(
+ ba2int(
+ self.bb[self.position : self.position + bit_length],
signed=False
+ )
+ )
return enum_return_value
else:
raise RuntimeError("read_enum called but read_function wasn't an
enum")
