拉力值计算优化

004_H515/jikong/get_laliji_param.py

@@ -66,17 +66,22 @@ class GetLalijiParam:
         }
 
         for k, v in serial_dict.items():
-            original = int(original_dict[v[0]])  # S485读取的无符号整数
+            original = original_dict[v[0]]  # S485读取的无符号整数
             a = param[v[1]]  # 参数A
             b = param[v[2]]  # 参数b
             f0 = param[v[3]]  # 参数f0
-            if original and original == 0:
-                lali_data[k] = 0
-            elif original and original != 0 and a and b and f0:
-                f = 80000000 / original  # 受力时频率f=80000000/（S485读取的无符号整数）
-                p = a * (f * f - f0 * f0) - b * (f - f0)  # P=A(f²-f0²)-B(f-f0)
-                lali_data[k] = round(p, 2)
-            else:
-                lali_data[k] = None
+
+            if original is not None:
+                original = int(original)
+
+                if original == 0:
+                    lali_data[k] = 0
+                elif a and b and f0:
+                    f = 80000000 / original  # 受力时频率f=80000000/（S485读取的无符号整数）
+                    p = a * (f * f - f0 * f0) - b * (f - f0)  # P=A(f²-f0²)-B(f-f0)
+                    lali_data[k] = round(p, 2)
+                else:
+                    pass
+                    # lali_data[k] = None
 
         self._storage.real_time_data_storage(lali_data)