From 2150ce329c83a58cb904356e0e850247f9057ab4 Mon Sep 17 00:00:00 2001 From: Martin Richtarsky Date: Tue, 29 Oct 2024 11:57:26 +0000 Subject: [PATCH] Sensor names: Remove trailing whitespace --- solax/inverters/x3_hybrid_g4.py | 2 +- solax/inverters/x3_mic_pro_g2.py | 2 +- solax/inverters/x3_ultra.py | 2 +- tests/samples/expected_values.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/solax/inverters/x3_hybrid_g4.py b/solax/inverters/x3_hybrid_g4.py index d4a15b3..e0c3e2c 100644 --- a/solax/inverters/x3_hybrid_g4.py +++ b/solax/inverters/x3_hybrid_g4.py @@ -98,7 +98,7 @@ def response_decoder(cls): "EPS 1 Power": (29, Units.W, to_signed), "EPS 2 Power": (30, Units.W, to_signed), "EPS 3 Power": (31, Units.W, to_signed), - "Grid Power ": (pack_u16(34, 35), Units.W, to_signed32), + "Grid Power": (pack_u16(34, 35), Units.W, to_signed32), # 'Battery Voltage' is twice in the json response and covered with 169, 170 below. # "Battery Voltage": (39, Units.V, div100), "Battery Current": (40, Units.A, twoway_div100), diff --git a/solax/inverters/x3_mic_pro_g2.py b/solax/inverters/x3_mic_pro_g2.py index 93c7a63..d5f681c 100644 --- a/solax/inverters/x3_mic_pro_g2.py +++ b/solax/inverters/x3_mic_pro_g2.py @@ -72,7 +72,7 @@ def response_decoder(cls): "Run Mode": (21, Units.NONE, X3MicProG2._decode_run_mode), "Total Yield": (pack_u16(22, 23), Total(Units.KWH), div10), "Daily Yield": (24, DailyTotal(Units.KWH), div10), - "Feed-in Power ": (pack_u16(72, 73), Units.W, to_signed32), + "Feed-in Power": (pack_u16(72, 73), Units.W, to_signed32), "Total Feed-in Energy": (pack_u16(74, 75), Total(Units.KWH), div100), "Total Consumption": (pack_u16(76, 77), Total(Units.KWH), div100), } diff --git a/solax/inverters/x3_ultra.py b/solax/inverters/x3_ultra.py index 438dfb9..5eea777 100644 --- a/solax/inverters/x3_ultra.py +++ b/solax/inverters/x3_ultra.py @@ -92,7 +92,7 @@ def response_decoder(cls): "EPS 1 Power": (29, Units.W, to_signed), "EPS 2 Power": (30, Units.W, to_signed), "EPS 3 Power": (31, Units.W, to_signed), - "Grid Power ": (pack_u16(34, 35), Units.W, to_signed32), + "Grid Power": (pack_u16(34, 35), Units.W, to_signed32), "Battery 1 Voltage": (39, Units.V, div10), "Battery 2 Voltage": (132, Units.V, div10), "Battery 1 Current": (40, Units.A, twoway_div100), diff --git a/tests/samples/expected_values.py b/tests/samples/expected_values.py index 36c7f05..0fb4679 100644 --- a/tests/samples/expected_values.py +++ b/tests/samples/expected_values.py @@ -285,7 +285,7 @@ "EPS 1 Power": 0.0, "EPS 2 Power": 0.0, "EPS 3 Power": 0.0, - "Grid Power ": -152.0, + "Grid Power": -152.0, "Battery Current": 0.0, "Battery Power": 0.0, "Load/Generator Power": 342.0, @@ -336,7 +336,7 @@ "Run Mode": "Normal", "Total Yield": 795.7, "Daily Yield": 20.0, - "Feed-in Power ": 2707.0, + "Feed-in Power": 2707.0, "Total Feed-in Energy": 657.24, "Total Consumption": 307.33, } @@ -621,7 +621,7 @@ "EPS 1 Power": 0.0, "EPS 2 Power": 0.0, "EPS 3 Power": 0.0, - "Grid Power ": 52.0, + "Grid Power": 52.0, "Battery 1 Voltage": 213.8, "Battery 2 Voltage": 212.9, "Battery 1 Current": 9.6,