q 2 vuotta sitten
vanhempi
commit
92f5242bbe
3 muutettua tiedostoa jossa 17 lisäystä ja 7 poistoa
  1. 5 5
      config/jinfeng/belt_north.json
  2. 5 1
      jf_belt_101.py
  3. 7 1
      jf_belt_102.py

+ 5 - 5
config/jinfeng/belt_north.json

@@ -9,14 +9,14 @@
       "common":[
         {
           "key":"JF.Device1.PD101.PD101_SD",
-          "name":"速度",
+          "label":"速度",
           "unit":"m/s",
           "val":""
         }
       ],
       "electric_parameter":[
         {
-          "name": "前轴温度",
+          "label": "前轴温度",
           "value_list": [
             {
               "key": "JF.Device1.PDBY.PDBY_DJ1_QZW",
@@ -36,7 +36,7 @@
           ]
         },
         {
-          "name": "后轴温度",
+          "label": "后轴温度",
           "value_list": [
             {
               "key": "JF.Device1.PDBY.PDBY_DJ1_HZW",
@@ -56,7 +56,7 @@
           ]
         },
         {
-          "name": "绕组温度",
+          "label": "绕组温度",
           "value_list": [
             {
               "key": "JF.Device1.PDBY.PDBY_DJ1_RZW1",
@@ -76,7 +76,7 @@
           ]
         },
         {
-          "name": "变频电流",
+          "label": "变频电流",
           "value_list": [
             {
               "key": "JF.Device1.PDBY.PDBY_BP1_DL",

+ 5 - 1
jf_belt_101.py

@@ -67,7 +67,11 @@ class jf_belt_101():
         comm = data['common']
         elec = data['electric_parameter']
         stat_key = data['key']
-        data['state'] = self.point_dict[stat_key]
+        stat_v = self.point_dict[stat_key]
+        if stat_v:
+            data['state'] = 1
+        elif stat_v == False:
+            data['state'] = 2
 
         for i in range(len(comm)):
             ck = comm[i]['key']

+ 7 - 1
jf_belt_102.py

@@ -64,9 +64,15 @@ class jf_belt_102():
 
     # 数据处理
     def data_handle(self, data):
+
+        stat_v = self.point_dict[data['key']]
+        if stat_v:
+            data['state'] = 1
+        elif stat_v == False:
+            data['state'] = 2
+            
         comm = data['common']
         elec = data['electric_parameter']
-        data['state'] = self.point_dict[data['key']]
 
         for i in range(len(comm)):
             ck = comm[i]['key']