From 0784c98220306a87a6017bfa114e2a9c0e91c31c Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 11 四月 2025 16:29:23 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
index fcb9e57..05fbea8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
@@ -64,9 +64,8 @@
private static void HandlePositiveAGV(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
{
// 姝f瀬AGV鍙渶瑕佸鐞嗗墠涓や釜淇″彿
- // 淇敼璇诲彇鏂瑰紡锛岀‘淇濊幏鍙栫涓�涓瓧鑺�
- var elevatorSignal = elevator.Communicator.Read<byte[]>(elevatorNames[0], 100)[0];
- var agvSignal = agv.Communicator.Read<byte[]>(agvNames[1], 100)[0];
+ var elevatorSignal = elevator.Communicator.Read(elevatorNames[0], 100);
+ var agvSignal = agv.Communicator.Read(agvNames[1], 100);
agv.Communicator.Write(agvNames[0], elevatorSignal);
elevator.Communicator.Write(agvNames[1], agvSignal);
@@ -128,7 +127,7 @@
int idx = startIdx + i;
if (idx >= elevatorNames.Count) break;
- var value = elevator.Communicator.Read<byte>(elevatorNames[idx], 100);
+ var value = elevator.Communicator.Read(elevatorNames[idx], 100);
agv.Communicator.Write(agvNames[idx], value);
values.Add(value);
targets.Add(agvNames[idx]);
@@ -142,7 +141,7 @@
int idx = startIdx + i;
if (idx >= agvNames.Count) break;
- var value = agv.Communicator.Read<byte>(agvNames[idx], 100);
+ var value = agv.Communicator.Read(agvNames[idx], 100);
elevator.Communicator.Write(elevatorNames[idx], value);
values.Add(value);
targets.Add(elevatorNames[idx]);
@@ -162,7 +161,7 @@
{
// 澶勭悊18-21鍙风數姊俊鍙凤紙4涓俊鍙凤級
var elevatorSignals = Enumerable.Range(18, 4)
- .Select(i => elevator.Communicator.Read<byte>(elevatorNames[i], 100))
+ .Select(i => elevator.Communicator.Read(elevatorNames[i], 100))
.ToList();
for (int i = 0; i < 4; i++)
@@ -172,7 +171,7 @@
// 澶勭悊22-23鍙稟GV淇″彿
var agvSignals = Enumerable.Range(22, 2)
- .Select(i => agv.Communicator.Read<byte>(agvNames[i], 100))
+ .Select(i => agv.Communicator.Read(agvNames[i], 100))
.ToList();
for (int i = 0; i < 2; i++)
--
Gitblit v1.9.3