From 973c93764dbf2f445f93c97ea69594c5753e3753 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 25 Apr 2022 19:17:24 +0800 Subject: [PATCH] updated acquisition procedure of myems-modbus-tcp --- myems-modbus-tcp/acquisition.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/myems-modbus-tcp/acquisition.py b/myems-modbus-tcp/acquisition.py index d0f49dc7..83c1bf6f 100644 --- a/myems-modbus-tcp/acquisition.py +++ b/myems-modbus-tcp/acquisition.py @@ -194,18 +194,15 @@ def process(logger, data_source_id, host, port): value = result[0] if point['object_type'] == 'ANALOG_VALUE': - analog_value_list.append({'data_source_id': data_source_id, - 'point_id': point['id'], + analog_value_list.append({'point_id': point['id'], 'is_trend': point['is_trend'], 'value': Decimal(value) * point['ratio']}) elif point['object_type'] == 'ENERGY_VALUE': - energy_value_list.append({'data_source_id': data_source_id, - 'point_id': point['id'], + energy_value_list.append({'point_id': point['id'], 'is_trend': point['is_trend'], 'value': Decimal(value) * point['ratio']}) elif point['object_type'] == 'DIGITAL_VALUE': - digital_value_list.append({'data_source_id': data_source_id, - 'point_id': point['id'], + digital_value_list.append({'point_id': point['id'], 'is_trend': point['is_trend'], 'value': int(value) * int(point['ratio'])})