瀏覽代碼

添加了数据过滤,加长出坯检测时间,修改出坯逻辑

oldwine 4 月之前
父節點
當前提交
2be7a36453
共有 4 個文件被更改,包括 15 次插入5 次删除
  1. 4 2
      models/billet_trace_pusher.py
  2. 5 2
      models/data_sender.py
  3. 1 0
      utils/mqttdata.py
  4. 5 1
      utils/statepoint.py

+ 4 - 2
models/billet_trace_pusher.py

@@ -33,6 +33,8 @@ class Trace_pusher:
 
         self.pusher_left = data_s7.make_point('推钢机激光')
         self.pusher_right = data_s7.make_point('推钢机激光')
+        self.pusher_left.hmd_add(0)
+        self.pusher_right.hmd_add(0)
 
         self.pusher_left.set_convertor(lambda data: data < min(self.strand_position))
         self.pusher_right.set_convertor(lambda data: data > max(self.strand_position))
@@ -89,7 +91,7 @@ class Trace_pusher:
             # 坯子出现
             self.billet_position[i].allow_update(False)
             self.billet_position[i].set_state(False)
-            self.billet_position[i].set_convertor(lambda data: data > 12000)
+            self.billet_position[i].set_convertor(lambda data: 12000 < data < 16000)
             self.billet_position[i].set_excite_action(lambda i=i: self.billet_out_action(i))
             self.billet_position[i].set_reset_action(lambda i=i: self.billet_in_buffer_action(i))
             self.billet_position[i].allow_update()
@@ -134,7 +136,7 @@ class Trace_pusher:
         with self.locks[i]:
             if self.strands_buffer[i]:
                 self.barrier_checker[i] = True
-                time.sleep(8)
+                time.sleep(12)
                 billetData = self.strands_buffer[i]
                 self.strands_buffer[i] = []
                 if self.strand_position[i] <= self.pusher_left.data:

+ 5 - 2
models/data_sender.py

@@ -354,6 +354,9 @@ if __name__ == '__main__':
     test.http_flag = False
 
     testheat = {"netWeight":140.06,"ladleNo":"13","heatNo":"25501045","grade":"微氮铌钢","castState":1,"spec":"上若泰基","ccmNo":"5","sendTime":"2025-01-20 09:44:17"}
-    test.host_send("5", "255010455107", "棒一")
+    #test.host_send("5", "255010455107", "棒一")
 
-    test.host_send("6", ["256009976601","256009976701","256009976801","256009976602"], "高线", "A2")
+    #test.host_send("6", ["256009976601","256009976701","256009976801","256009976602"], "高线", "A2")
+    test.car_add("6", "4", "陕E00901")
+    test.car_save("6", "256012036107,256012036207,256012036407,256012036108,", "陕E00901", "A3", "2025-01-23 16:22:17", "6#小冷床(右)", "车位4")
+    #test.car_go("6", "陕E00901")

+ 1 - 0
utils/mqttdata.py

@@ -80,6 +80,7 @@ class Mqttdata:
             if self.logger:
                 self.logger.error(f"Failed to connect: {reason_code}. loop_forever() will retry connection")
         else:
+            client.subscribe('data/service/cast/info', qos=2)
             if self.logger:
                 self.logger.info("MQTT connection succeeded")
 

+ 5 - 1
utils/statepoint.py

@@ -4,6 +4,7 @@ class Statepoint:
     def __init__(self, initvalue = False, initstate = False):
         self.data = initvalue
         self.state = initstate
+        self.hmd = set()
         self.lock = threading.Lock()
         self.permitted_update = True
         self.__private_permitted_update = True
@@ -13,8 +14,11 @@ class Statepoint:
         self.keep_time = 1000
         self.pre_reset = False
 
+    def hmd_add(self, data):
+        self.hmd.add(data)
+
     def inject(self, data):
-        if self.data == data:
+        if self.data == data or (self.hmd and data in self.hmd):
             return None
         #数据更新
         self.data = data