1121
This commit is contained in:
@ -470,9 +470,10 @@ class command_hex:
|
||||
"""
|
||||
|
||||
# 寻找连续三个0x2C的情况
|
||||
for idx in range(len(response) - 2):
|
||||
if response[idx] == 0x2C and response[idx+1] == 0x2C and response[idx+2] == 0x2C:
|
||||
response=response[:idx]
|
||||
# for idx in range(len(response) - 2):
|
||||
# if response[idx] == 0x2C and response[idx+1] == 0x2C and response[idx+2] == 0x2C:
|
||||
# response=response[:idx]
|
||||
# break
|
||||
# 验证响应长度
|
||||
if len(response) <= 1 or len(response) != response[0] + 1:
|
||||
raise ValueError("应答数据长度不正确")
|
||||
@ -499,7 +500,12 @@ class command_hex:
|
||||
loc_string = ''
|
||||
if data_part:
|
||||
try:
|
||||
|
||||
loc_string = data_part.decode('ascii')
|
||||
first_empty = loc_string.find(',,,')
|
||||
if first_empty != -1:
|
||||
loc_string = loc_string[:first_empty]
|
||||
print('收到数据:',loc_string)
|
||||
except UnicodeDecodeError:
|
||||
print(f"无法将数据转换为ASCII字符串: {data_part}")
|
||||
return loc_string
|
||||
|
||||
@ -380,7 +380,7 @@ class rfid_service:
|
||||
接收线程的主循环,用于接收RFID推送的数据
|
||||
"""
|
||||
while self._thread_signal:
|
||||
|
||||
self._pause_receive=False
|
||||
if self._pause_receive:
|
||||
time.sleep(1)
|
||||
continue
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
# hardware/relay.py
|
||||
import socket
|
||||
import binascii
|
||||
import time
|
||||
import threading
|
||||
from pymodbus.client import ModbusTcpClient
|
||||
from pymodbus.exceptions import ModbusException
|
||||
from config.settings import Settings
|
||||
from config.settings import app_set_config
|
||||
|
||||
|
||||
class RelayController:
|
||||
# 继电器映射
|
||||
FAST_STOP = 'fast_stop' # DO1 - 急停
|
||||
RING = 'ring' # DO1 - 响铃
|
||||
UPPER_TO_JBL = 'upper_to_jbl' # DO2 - 上料斗到搅拌楼
|
||||
UPPER_TO_ZD = 'upper_to_zd' # DO3 - 上料斗到振捣室
|
||||
# DOOR_UPPER = 'door_upper' # DO0 - 上料斗滑动
|
||||
@ -20,38 +22,37 @@ class RelayController:
|
||||
BREAK_ARCH_LOWER = 'break_arch_lower' # DO4 - 下料斗震动
|
||||
DIRECT_LOWER_FRONT = 'direct_lower_front' # DO5 - 下料斗前
|
||||
DIRECT_LOWER_BEHIND = 'direct_lower_behind' # DO6 - 下料斗后
|
||||
DIRECT_LOWER_LEFT = 'direct_lower_left' # DO7 - 下料斗左
|
||||
DIRECT_LOWER_RIGHT = 'direct_lower_right' # DO8 - 下料斗右
|
||||
DIRECT_LOWER_TOP = 'direct_lower_top' # DO7 - 下料斗上
|
||||
DIRECT_LOWER_BELOW = 'direct_lower_below' # DO8 - 下料斗下
|
||||
|
||||
def __init__(self, host='192.168.250.62', port=50000):
|
||||
self.host = host
|
||||
self.port = port
|
||||
self.modbus_client = ModbusTcpClient(host, port=port)
|
||||
#遥1 DO 7 左 DO8 右 角度 摇2:DO 12上 13下 14 往后 15往前
|
||||
#遥1 DO 7 左 DO8 右 角度 摇2:DO 15下 13上 12 往后 14往前 下料斗DO7开 D09关
|
||||
# 继电器命令(原始Socket)
|
||||
self.relay_commands = {
|
||||
self.FAST_STOP: {'open': '00000000000601050000FF00', 'close': '000000000006010500000000'},
|
||||
self.RING: {'open': '00000000000601050000FF00', 'close': '000000000006010500000000'},
|
||||
self.UPPER_TO_JBL: {'open': '00000000000601050001FF00', 'close': '000000000006010500010000'},
|
||||
self.UPPER_TO_ZD: {'open': '00000000000601050002FF00', 'close': '000000000006010500020000'},
|
||||
self.DOOR_LOWER_OPEN: {'open': '00000000000601050006FF00', 'close': '00000000000601050006FF00'},
|
||||
self.DOOR_LOWER_CLOSE: {'open': '00000000000601050007FF00', 'close': '000000000006010500070000'},
|
||||
self.DOOR_LOWER_CLOSE: {'open': '00000000000601050008FF00', 'close': '000000000006010500080000'},
|
||||
self.DOOR_UPPER_OPEN: {'open': '00000000000601050003FF00', 'close': '000000000006010500030000'},
|
||||
self.DOOR_UPPER_CLOSE: {'open': '00000000000601050004FF00', 'close': '000000000006010500040000'},
|
||||
self.BREAK_ARCH_UPPER: {'open': '0000000000060105000AFF00', 'close': '0000000000060105000A0000'},
|
||||
self.BREAK_ARCH_LOWER: {'open': '00000000000601050005FF00', 'close': '000000000006010500050000'},
|
||||
self.DIRECT_LOWER_FRONT: {'open': '00000000000601050005FF00', 'close': '000000000006010500050000'},
|
||||
self.DIRECT_LOWER_BEHIND: {'open': '00000000000601050005FF00', 'close': '000000000006010500050000'},
|
||||
self.DIRECT_LOWER_LEFT: {'open': '00000000000601050005FF00', 'close': '000000000006010500050000'},
|
||||
self.DIRECT_LOWER_RIGHT: {'open': '00000000000601050005FF00', 'close': '000000000006010500050000'}
|
||||
self.DIRECT_LOWER_FRONT: {'open': '0000000000060105000DFF00', 'close': '0000000000060105000D0000'},
|
||||
self.DIRECT_LOWER_BEHIND: {'open': '0000000000060105000BFF00', 'close': '0000000000060105000B0000'},
|
||||
self.DIRECT_LOWER_TOP: {'open': '0000000000060105000CFF00', 'close': '0000000000060105000C0000'},
|
||||
self.DIRECT_LOWER_BELOW: {'open': '0000000000060105000EFF00', 'close': '0000000000060105000E0000'}
|
||||
}
|
||||
|
||||
self.settings = Settings()
|
||||
# 读取状态命令
|
||||
self.read_status_command = '000000000006010100000008'
|
||||
|
||||
# 设备位映射
|
||||
self.device_bit_map = {
|
||||
self.FAST_STOP: 0,
|
||||
self.RING: 0,
|
||||
self.UPPER_TO_JBL: 1,
|
||||
self.UPPER_TO_ZD: 2,
|
||||
self.BREAK_ARCH_UPPER: 3,
|
||||
@ -60,7 +61,7 @@ class RelayController:
|
||||
|
||||
def send_command(self, command_hex):
|
||||
"""发送原始Socket命令"""
|
||||
if not self.settings.debug_feeding:
|
||||
if app_set_config.debug_mode:
|
||||
return None
|
||||
|
||||
try:
|
||||
@ -93,7 +94,40 @@ class RelayController:
|
||||
def control(self, device, action):
|
||||
"""控制继电器"""
|
||||
if device in self.relay_commands and action in self.relay_commands[device]:
|
||||
print(f"控制继电器 {device} {action}")
|
||||
print(f"发送控制继电器命令 {device} {action}")
|
||||
self.send_command(self.relay_commands[device][action])
|
||||
else:
|
||||
print(f"无效设备或动作: {device}, {action}")
|
||||
|
||||
def control_upper_close(self):
|
||||
"""控制上料斗关"""
|
||||
# 关闭上料斗出砼门
|
||||
self.control(self.DOOR_UPPER_CLOSE, 'open')
|
||||
# 异步5秒后关闭
|
||||
threading.Thread(target=self._close_upper_5s, daemon=True,name="close_upper_5s").start()
|
||||
|
||||
def control_lower_close(self):
|
||||
"""控制下料斗关"""
|
||||
# 关闭下料斗出砼门
|
||||
self.control(self.DOOR_LOWER_CLOSE, 'open')
|
||||
# 异步5秒后关闭
|
||||
threading.Thread(target=self._close_lower_5s, daemon=True,name="close_lower_5s").start()
|
||||
|
||||
def control_ring_open(self):
|
||||
"""控制下料斗关"""
|
||||
# 关闭下料斗出砼门
|
||||
self.control(self.RING, 'open')
|
||||
# 异步5秒后关闭
|
||||
threading.Thread(target=self._close_ring, daemon=True,name="close_ring").start()
|
||||
|
||||
def _close_upper_5s(self):
|
||||
time.sleep(5)
|
||||
self.control(self.DOOR_UPPER_CLOSE, 'close')
|
||||
|
||||
def _close_lower_5s(self):
|
||||
time.sleep(5)
|
||||
self.control(self.DOOR_LOWER_CLOSE, 'close')
|
||||
|
||||
def _close_ring(self):
|
||||
time.sleep(3)
|
||||
self.control(self.RING, 'close')
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
# hardware/transmitter.py
|
||||
from pymodbus.exceptions import ModbusException
|
||||
import socket
|
||||
from config.ini_manager import ini_manager
|
||||
from config.settings import app_set_config
|
||||
|
||||
|
||||
|
||||
class TransmitterController:
|
||||
def __init__(self, relay_controller):
|
||||
self.relay_controller = relay_controller
|
||||
|
||||
# 变送器配置
|
||||
self.config = {
|
||||
1: { # 上料斗
|
||||
@ -75,88 +78,57 @@ class TransmitterController:
|
||||
Args: transmitter_id 为1 表示上料斗, 为2 表示下料斗
|
||||
return: 读取成功返回重量 weight: int, 失败返回 None
|
||||
"""
|
||||
TIMEOUT = 2 # 超时时间为 2秒
|
||||
BUFFER_SIZE= 1024
|
||||
IP = None
|
||||
PORT = None
|
||||
weight = 0
|
||||
|
||||
|
||||
if transmitter_id == 1:
|
||||
# 上料斗变送器的信息:
|
||||
IP = "192.168.250.63"
|
||||
PORT = 502
|
||||
TIMEOUT = 2 # 超时时间为 2秒
|
||||
BUFFER_SIZE= 1024
|
||||
weight = None
|
||||
if self.relay_controller.settings.debug_feeding:
|
||||
return 0
|
||||
|
||||
import socket
|
||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
||||
try:
|
||||
s.settimeout(TIMEOUT)
|
||||
s.connect((IP, PORT))
|
||||
# print(f"连接上料斗变送器 {IP}:{PORT} 成功")
|
||||
|
||||
# 接收数据(变送器主动推送,recv即可获取数据)
|
||||
data = s.recv(BUFFER_SIZE)
|
||||
if data:
|
||||
# print(f"收到原始数据:{data}")
|
||||
|
||||
# 提取出完整的一个数据包 (\r\n结尾)
|
||||
packet = self.get_latest_valid_packet(data)
|
||||
if not packet:
|
||||
print("未获取到有效数据包!!")
|
||||
return None
|
||||
# 解析重量
|
||||
weight = self.parse_weight(packet)
|
||||
else:
|
||||
print("未收到设备数据")
|
||||
|
||||
except ConnectionRefusedError:
|
||||
print(f"变送器连接失败:{IP}:{PORT} 拒绝连接(设备离线/端口错误)")
|
||||
except socket.timeout:
|
||||
print(f"读取变送器数据超时:{TIMEOUT}秒内未收到数据")
|
||||
except Exception as e:
|
||||
print(f"读取异常:{e}")
|
||||
|
||||
# 成功返回重量(int),失败返回None
|
||||
return weight
|
||||
|
||||
IP = ini_manager.upper_transmitter_ip
|
||||
PORT = ini_manager.upper_transmitter_port
|
||||
elif transmitter_id == 2:
|
||||
# 上料斗变送器的信息:
|
||||
IP = "192.168.250.66"
|
||||
PORT = 8234
|
||||
TIMEOUT = 2 # 超时时间为 2秒
|
||||
BUFFER_SIZE= 1024
|
||||
weight = None
|
||||
if self.relay_controller.settings.debug_feeding:
|
||||
return 0
|
||||
import socket
|
||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
||||
try:
|
||||
s.settimeout(TIMEOUT)
|
||||
s.connect((IP, PORT))
|
||||
# print(f"连接上料斗变送器 {IP}:{PORT} 成功")
|
||||
|
||||
# 接收数据(变送器主动推送,recv即可获取数据)
|
||||
data = s.recv(BUFFER_SIZE)
|
||||
if data:
|
||||
# print(f"收到原始数据:{data}")
|
||||
|
||||
# 提取出完整的一个数据包 (\r\n结尾)
|
||||
packet = self.get_latest_valid_packet(data)
|
||||
if not packet:
|
||||
print("未获取到有效数据包!!")
|
||||
return None
|
||||
# 解析重量
|
||||
weight = self.parse_weight(packet)
|
||||
else:
|
||||
print("未收到设备数据")
|
||||
|
||||
except ConnectionRefusedError:
|
||||
print(f"变送器连接失败:{IP}:{PORT} 拒绝连接(设备离线/端口错误)")
|
||||
except socket.timeout:
|
||||
print(f"读取变送器数据超时:{TIMEOUT}秒内未收到数据")
|
||||
except Exception as e:
|
||||
print(f"读取异常:{e}")
|
||||
# 下料斗变送器的信息:
|
||||
IP = ini_manager.lower_transmitter_ip
|
||||
PORT = ini_manager.lower_transmitter_port
|
||||
|
||||
# 成功返回重量(int),失败返回None
|
||||
return weight
|
||||
if not IP or not PORT:
|
||||
print(f"未配置变送器 {transmitter_id} 的IP或PORT")
|
||||
return 0
|
||||
if app_set_config.debug_mode:
|
||||
print(f"调试模式,未读数据({transmitter_id},IP: {IP}:{PORT})")
|
||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
||||
try:
|
||||
s.settimeout(TIMEOUT)
|
||||
s.connect((IP, PORT))
|
||||
# print(f"连接上料斗变送器 {IP}:{PORT} 成功")
|
||||
|
||||
# 接收数据(变送器主动推送,recv即可获取数据)
|
||||
data = s.recv(BUFFER_SIZE)
|
||||
if data:
|
||||
# print(f"收到原始数据:{data}")
|
||||
|
||||
# 提取出完整的一个数据包 (\r\n结尾)
|
||||
packet = self.get_latest_valid_packet(data)
|
||||
if not packet:
|
||||
print("未获取到有效数据包!!")
|
||||
return None
|
||||
# 解析重量
|
||||
weight = self.parse_weight(packet)
|
||||
else:
|
||||
print("未收到设备数据")
|
||||
|
||||
except ConnectionRefusedError:
|
||||
print(f"变送器连接失败:{IP}:{PORT} 拒绝连接(设备离线/端口错误)")
|
||||
except socket.timeout:
|
||||
print(f"读取变送器数据超时:{TIMEOUT}秒内未收到数据")
|
||||
except Exception as e:
|
||||
print(f"读取异常:{e}")
|
||||
|
||||
# 成功返回重量(int),失败返回None
|
||||
return weight
|
||||
|
||||
def get_latest_valid_packet(self, raw_data):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user