feeding

core/state.py

@@ -7,12 +7,32 @@ class SystemState(QObject):
     state_updated=Signal(str,object)
     def __init__(self):
         super().__init__()
+        # 
+        self._watched_props = []
+        self.lock = threading.RLock()
+        
         # 系统运行状态
-        self.running = False
+        self.running = True
 
-        # 下料控制相关
+        # 上料斗控制相关
         self._upper_door_position = 'default'  # default(在搅拌楼下接料), over_lower(在下料斗上方), returning(返回中)
+        # 是否破拱
+        self._upper_is_arch_=False
+        self._upper_door_closed=True
+        self._upper_weight=0
+        self._upper_volume=0.0
+
+        #下料斗状态想着
         self._lower_feeding_stage = 0  # 0:未下料, 1:第一阶段, 2:第二阶段, 3:第三阶段, 4:等待模具车对齐
+        self._lower_is_arch_=False
+        self._lower_weight=0
+        self._lower_angle=0.0
+
+        #模具车状态
+        self._mould_weight=0
+        self._mould_frequency=220
+        self._mould_vibrate_status=0 #1振动中0未振动
+      
         self.lower_feeding_cycle = 0  # 下料斗下料循环次数
         self.upper_feeding_count = 0  # 上料斗已下料次数
         self.upper_feeding_max = 2 #上料斗最大下料次数
@@ -21,7 +41,11 @@ class SystemState(QObject):
         self.last_upper_weight = 0
         self.last_lower_weight = 0
         self.last_weight_time = 0
-        self.need_total_weight=0
+        #需要下料的总重量
+        self._mould_need_weight=0
+        #完成下料的总重量
+        self._mould_finish_weight=0
+    
         self.initial_upper_weight=0
         self.initial_lower_weight=0
 
@@ -31,7 +55,8 @@ class SystemState(QObject):
 
         # 视觉系统状态
         self.angle_control_mode = "normal"  # 角度控制模式: normal, reducing, maintaining, recovery
-        self.overflow_detected = False  # 堆料检测
+        self.overflow_detected = "0"  # 堆料检测
+        self.current_finish_status=False  # 当前是否完成浇筑满
         self.door_opening_large = False  # 夹角
         self.vehicle_aligned = False  # 模具车是否对齐
         self.last_angle = None  # 上次检测角度
@@ -42,16 +67,13 @@ class SystemState(QObject):
         #当前生产的管片
         self.current_artifact=None
         #当前生产状态
-        self.feed_status=FeedStatus.FNone
+        self._feed_status=FeedStatus.FNone
         #每方重量
         self.density=2500
         
-
-        # 记录需要监听的属性名（筛选掉不需要发信号的内部变量）
-        #是否破拱
-        self._upper_is_arch_=False
-        self._lower_is_arch_=False
-        self.lock = threading.RLock()
+      
+        
+        # 
         self._watched_props = [k for k in self.__dict__ if k.startswith('_')]
     
     def __setattr__(self, name, value):