diff --git a/powerbus_service/sensor.py b/powerbus_service/sensor.py index 15f6e89..ae6ad96 100644 --- a/powerbus_service/sensor.py +++ b/powerbus_service/sensor.py @@ -206,11 +206,12 @@ class SensorService: return 0.0 return 50 * 1000.0 * 60 * 10 / 660 / freq - def wsu_get_flow_rate_g2(self, freq): + def wsu_get_flow_rate_g2(self, freq, factor): """计算WSU流量""" if freq == 0: return 0.0 - return 50 * 1000.0 * 60 * 10 / 660 / freq + + return freq * 60 / factor def handle_wsu_data(self, device, regs): """处理WSU数据""" @@ -229,7 +230,8 @@ class SensorService: flow_rate = self.wsu_get_flow_rate_g1(flow_rate) water_temp = self.wsu_get_temperature(water_temp * 2) elif generation == "2": - flow_rate = self.wsu_get_flow_rate_g2(flow_rate) + factor = device.get("factor", 6000) + flow_rate = self.wsu_get_flow_rate_g2(flow_rate, factor) water_temp = self.wsu_get_temperature(water_temp * 2) return flow_rate, water_temp