home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-09-11 15:51:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

modbus: use only 1 logger instance. (#150130)

Browse Source
This commit is contained in:
jan iversen
2025-08-07 15:11:00 +02:00
committed by GitHub
parent b835b7f266
commit d99379ffdf
7 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/modbus/binary_sensor.py
View File

@@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import logging
from typing import Any from typing import Any
from homeassistant.components.binary_sensor import BinarySensorEntity from homeassistant.components.binary_sensor import BinarySensorEntity
@@ -24,6 +23,7 @@ from homeassistant.helpers.update_coordinator import (
from . import get_hub from . import get_hub
from .const import ( from .const import (
_LOGGER,
CALL_TYPE_COIL, CALL_TYPE_COIL,
CALL_TYPE_DISCRETE, CALL_TYPE_DISCRETE,
CONF_SLAVE_COUNT, CONF_SLAVE_COUNT,
@@ -32,8 +32,6 @@ from .const import (
from .entity import BasePlatform from .entity import BasePlatform
from .modbus import ModbusHub from .modbus import ModbusHub
_LOGGER = logging.getLogger(__name__)
PARALLEL_UPDATES = 1 PARALLEL_UPDATES = 1

4
homeassistant/components/modbus/climate.py
View File

@@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import logging
import struct import struct
from typing import Any, cast from typing import Any, cast
@@ -44,6 +43,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from . import get_hub from . import get_hub
from .const import ( from .const import (
_LOGGER,
CALL_TYPE_COIL, CALL_TYPE_COIL,
CALL_TYPE_REGISTER_HOLDING, CALL_TYPE_REGISTER_HOLDING,
CALL_TYPE_WRITE_COIL, CALL_TYPE_WRITE_COIL,
@@ -104,8 +104,6 @@ from .const import (
from .entity import BaseStructPlatform from .entity import BaseStructPlatform
from .modbus import ModbusHub from .modbus import ModbusHub
_LOGGER = logging.getLogger(__name__)
PARALLEL_UPDATES = 1 PARALLEL_UPDATES = 1
HVACMODE_TO_TARG_TEMP_REG_INDEX_ARRAY = { HVACMODE_TO_TARG_TEMP_REG_INDEX_ARRAY = {

3
homeassistant/components/modbus/const.py
View File

@@ -1,6 +1,7 @@
"""Constants used in modbus integration.""" """Constants used in modbus integration."""
from enum import Enum from enum import Enum
import logging
from homeassistant.const import ( from homeassistant.const import (
CONF_ADDRESS, CONF_ADDRESS,
@@ -177,3 +178,5 @@ LIGHT_MAX_BRIGHTNESS = 255
LIGHT_MODBUS_SCALE_MIN = 0 LIGHT_MODBUS_SCALE_MIN = 0
LIGHT_MODBUS_SCALE_MAX = 100 LIGHT_MODBUS_SCALE_MAX = 100
LIGHT_MODBUS_INVALID_VALUE = 0xFFFF LIGHT_MODBUS_INVALID_VALUE = 0xFFFF
_LOGGER = logging.getLogger(__package__)

4
homeassistant/components/modbus/entity.py
View File

@@ -6,7 +6,6 @@ from abc import abstractmethod
import asyncio import asyncio
from collections.abc import Callable from collections.abc import Callable
from datetime import datetime, timedelta from datetime import datetime, timedelta
import logging
import struct import struct
from typing import Any, cast from typing import Any, cast
@@ -33,6 +32,7 @@ from homeassistant.helpers.event import async_call_later, async_track_time_inter
from homeassistant.helpers.restore_state import RestoreEntity from homeassistant.helpers.restore_state import RestoreEntity
from .const import ( from .const import (
_LOGGER,
CALL_TYPE_COIL, CALL_TYPE_COIL,
CALL_TYPE_DISCRETE, CALL_TYPE_DISCRETE,
CALL_TYPE_REGISTER_HOLDING, CALL_TYPE_REGISTER_HOLDING,
@@ -68,8 +68,6 @@ from .const import (
) )
from .modbus import ModbusHub from .modbus import ModbusHub
_LOGGER = logging.getLogger(__name__)
class BasePlatform(Entity): class BasePlatform(Entity):
"""Base for readonly platforms.""" """Base for readonly platforms."""

2
homeassistant/components/modbus/light.py
View File

@@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import logging
from typing import Any from typing import Any
from homeassistant.components.light import ( from homeassistant.components.light import (
@@ -35,7 +34,6 @@ from .entity import BaseSwitch
from .modbus import ModbusHub from .modbus import ModbusHub
PARALLEL_UPDATES = 1 PARALLEL_UPDATES = 1
_LOGGER = logging.getLogger(__name__)
async def async_setup_platform( async def async_setup_platform(

3
homeassistant/components/modbus/modbus.py
View File

@@ -5,7 +5,6 @@ from __future__ import annotations
import asyncio import asyncio
from collections import namedtuple from collections import namedtuple
from collections.abc import Callable from collections.abc import Callable
import logging
from typing import Any from typing import Any
from pymodbus.client import ( from pymodbus.client import (
@@ -38,6 +37,7 @@ from homeassistant.helpers.typing import ConfigType
from homeassistant.util.hass_dict import HassKey from homeassistant.util.hass_dict import HassKey
from .const import ( from .const import (
_LOGGER,
ATTR_ADDRESS, ATTR_ADDRESS,
ATTR_HUB, ATTR_HUB,
ATTR_SLAVE, ATTR_SLAVE,
@@ -70,7 +70,6 @@ from .const import (
) )
from .validators import check_config from .validators import check_config
_LOGGER = logging.getLogger(__name__)
DATA_MODBUS_HUBS: HassKey[dict[str, ModbusHub]] = HassKey(DOMAIN) DATA_MODBUS_HUBS: HassKey[dict[str, ModbusHub]] = HassKey(DOMAIN)

5
homeassistant/components/modbus/sensor.py
View File

@@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import logging
from typing import Any from typing import Any
from homeassistant.components.sensor import ( from homeassistant.components.sensor import (
@@ -26,12 +25,10 @@ from homeassistant.helpers.update_coordinator import (
) )
from . import get_hub from . import get_hub
from .const import CONF_SLAVE_COUNT, CONF_VIRTUAL_COUNT from .const import _LOGGER, CONF_SLAVE_COUNT, CONF_VIRTUAL_COUNT
from .entity import BaseStructPlatform from .entity import BaseStructPlatform
from .modbus import ModbusHub from .modbus import ModbusHub
_LOGGER = logging.getLogger(__name__)
PARALLEL_UPDATES = 1 PARALLEL_UPDATES = 1