Skip to content

fix: multisensor current and energy sensor scales #180

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

Open
bkobus-bbx wants to merge 1 commit into
base: master
Choose a base branch
from
+71 −3
Open

fix: multisensor current and energy sensor scales #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions blebox_uniapi/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ def __str__(self):


@SensorFactory.register("frequency", unit="Hz", scale=1_000)
@SensorFactory.register("current", unit="mA", scale=1_000)
@SensorFactory.register("current", unit="mA")
@SensorFactory.register("voltage", unit="V", scale=10)
@SensorFactory.register("apparentPower", unit="va")
@SensorFactory.register("reactivePower", unit="var")
@SensorFactory.register("activePower", unit="W")
@SensorFactory.register("reverseActiveEnergy", unit="kWh")
@SensorFactory.register("forwardActiveEnergy", unit="kWh")
@SensorFactory.register("reverseActiveEnergy", unit="kWh", scale=1_000)
@SensorFactory.register("forwardActiveEnergy", unit="kWh", scale=1_000)
@SensorFactory.register("illuminance", unit="lx", scale=100)
@SensorFactory.register("humidity", unit="percentage", scale=100)
@SensorFactory.register("wind", unit="m/s", scale=10)
Expand Down
68 changes: 68 additions & 0 deletions tests/test_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,74 @@ async def test_multisensor_update(self, aioclient_mock):
assert entity.native_value == 1.2


class TestMultiSensorEnergy(DefaultBoxTest):
"""Tests for multiSensor energy/current sensors (apiLevel 20230606)."""

DEVCLASS = "sensors"
ENTITY_CLASS = BleBoxSensorEntity

DEV_INFO_PATH = "state"

DEVICE_INFO = json.loads(
"""
{
"device": {
"deviceName": "My multiSensor",
"type": "multiSensor",
"product": "energySensor",
"hv": "eS-1.0",
"fv": "0.1",
"universe": 0,
"apiLevel": "20230606",
"id": "aa00112233bb",
"ip": "172.0.0.1",
"availableFv": null
}
}
"""
)

def patch_version(apiLevel):
return f'{{ "device": {{ "apiLevel": {apiLevel} }} }}'

DEVICE_INFO_FUTURE = jmerge(DEVICE_INFO, patch_version(future_date()))
DEVICE_INFO_LATEST = jmerge(
DEVICE_INFO, patch_version(get_latest_api_level("multiSensor"))
)
DEVICE_INFO_UNSUPPORTED = jmerge(DEVICE_INFO, patch_version(20180603))
DEVICE_INFO_UNSPECIFIED_API = None

STATE_DEFAULT = json.loads(
"""
{
"multiSensor": {
"sensors": [
{"type": "current", "id": 0, "value": 1500},
{"type": "forwardActiveEnergy", "id": 1, "value": 5000},
{"type": "reverseActiveEnergy", "id": 2, "value": 3000}
]
}
}
"""
)

DEVICE_EXTENDED_INFO = STATE_DEFAULT
DEVICE_EXTENDED_INFO_PATH = "/state/extended"

@pytest.mark.parametrize(
"index,unit,value",
[
(0, "mA", 1500),
(1, "kWh", 5.0),
(2, "kWh", 3.0),
],
)
async def test_sensor_value(self, aioclient_mock, index, unit, value):
entity = await self.updated(aioclient_mock, self.STATE_DEFAULT, index=index)
assert entity._feature.unit == unit
assert entity.native_value == value


class TestAirSensor(DefaultBoxTest):
"""Tests for sensors representing BleBox airSensor."""

Expand Down