Skip to content

Fix X1G4Series schema to support 300 data point responses #210

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
coy2k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix X1G4Series schema to support 300 data point responses #210

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
2 changes: 1 addition & 1 deletion solax/inverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def sensor_map(cls) -> Dict[str, Tuple[int, Measurement]]:
for name, mapping in cls.response_decoder().items():
unit = Measurement(Units.NONE)

(idx, unit_or_measurement, *_) = mapping
idx, unit_or_measurement, *_ = mapping

if isinstance(unit_or_measurement, Units):
unit = Measurement(unit_or_measurement)
Expand Down
8 changes: 7 additions & 1 deletion solax/inverters/x1_g4_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ class X1G4Series(Inverter):
): str,
vol.Required("ver"): str,
vol.Required("data"): vol.Schema(
vol.All([vol.Coerce(float)], vol.Length(min=100, max=100))
vol.All(
[vol.Coerce(float)],
vol.Any(
vol.Length(min=100, max=100),
vol.Length(min=300, max=300),
),
)
),
vol.Required("information"): vol.Schema(
vol.All(vol.Length(min=10, max=10))
Expand Down
6 changes: 3 additions & 3 deletions solax/response_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def serial_number(self):
_KEY_TYPE = "type"


GenericResponseSchema = vol.All(
GENERIC_RESPONSE_SCHEMA = vol.All(
vol.Schema({vol.Required(_KEY_SERIAL): str}, extra=vol.ALLOW_EXTRA),
vol.Any(
vol.Schema({vol.Required(_KEY_VERSION): str}, extra=vol.ALLOW_EXTRA),
Expand Down Expand Up @@ -77,7 +77,7 @@ def __init__(
dongle_serial_number_getter: Callable[[Dict[str, Any]], Optional[str]],
inverter_serial_number_getter: Callable[[Dict[str, Any]], Optional[str]],
) -> None:
self.schema = vol.And(GenericResponseSchema, schema)
self.schema = vol.And(GENERIC_RESPONSE_SCHEMA, schema)
self.response_decoder = decoder
self.dongle_serial_number_getter = dongle_serial_number_getter
self.inverter_serial_number_getter = inverter_serial_number_getter
Expand All @@ -95,7 +95,7 @@ def _postprocess_gen(
Return map of functions to be applied to each sensor value
"""
for name, mapping in self.response_decoder.items():
(_, _, *processors) = mapping
_, _, *processors = mapping
for processor in processors:
yield name, processor

Expand Down
Loading