Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d6d176be 由 刘韬
选项

1

1 个父辈 93afe3d7
内嵌 并排
正在显示 8 个修改的文件 包含 51 行增加 和 63 行删除
Common/util/MyWebClient.cs
......@@ -89,7 +89,7 @@ namespace OnlineStore.Common
try
{
using (var wc = new MyWebClient(10000))
using (var wc = new MyWebClient(timeOut))
{
if (string.IsNullOrEmpty(wc.Headers["Content-Type"]))
{
......@@ -110,40 +110,19 @@ namespace OnlineStore.Common
return result;
}
static object lockpost = new object();
public static Operation Post(string url, Operation operation, bool simulate, bool printlog=false)
public static Operation Post(string url, Operation operation,int timeout=5000, bool printlog=false)
{
try
{
if (simulate)
{//模拟服务器返回
operation.status = 200;
operation.data.Clear();
operation.data.Add("posId", "A001");
string pos = "D100-111#D102-222#D104-333";
operation.data.Add("pos", pos);
if (operation.op == 1 || operation.op == 2)
{//入库或出库
string json = JsonHelper.SerializeObject(operation);
string result = Post(url, json, timeout);
Operation op = JsonHelper.DeserializeJsonToObject<Operation>(result);
string json = JsonHelper.SerializeObject(operation);
LogUtil.error( "模拟HTTP服务器返回出库入库信息：" + json);
return operation;
}
}
else
if (printlog)
{
//lock (lockpost)
{
string json = JsonHelper.SerializeObject(operation);
string result = Post(url, json,2000);
Operation op = JsonHelper.DeserializeJsonToObject<Operation>(result);
if (printlog)
{
LogUtil.info("Send [" + json + "] Revice [" + result + "]");
}
return op;
}
LogUtil.info("Send [" + json + "] Revice [" + result + "]");
}
return op;
}
catch (Exception ex)
{
......
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
......@@ -36,12 +36,22 @@ namespace DeviceLibrary
serverConnectTimer.AutoReset = true;
serverConnectTimer.Enabled = true;
serverConnectTimer.Elapsed += ServerConnectTimer_Elapsed;
GC.KeepAlive(serverConnectTimer);
}
int lockerrtime = 0;
private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
if (!Monitor.TryEnter(serverConnectTimer))
return;
//if (!Monitor.TryEnter(serverConnectTimer))
//{
// LogUtil.error("ServerConnectTimer_Elapsed locked");
// lockerrtime++;
// if (lockerrtime > 3)
// {
// lockerrtime = 0;
// Monitor.Exit(serverConnectTimer);
// }
// return;
//}
try
{
if (!RobotManage.isRunning)
......@@ -53,7 +63,7 @@ namespace DeviceLibrary
}
finally {
Monitor.Exit(serverConnectTimer);
//Monitor.Exit(serverConnectTimer);
}
}
public void StartConnectServer() {
......@@ -93,7 +103,7 @@ namespace DeviceLibrary
{
operation.data.Add("singleIn", "false");
}
Operation resultOperation = HttpHelper.Post(GetPostApi(), operation, false, printlog);
Operation resultOperation = HttpHelper.Post(GetPostApi(), operation, 5000, printlog);
if (operation.seq != resultOperation.seq)
{
Thread.Sleep(1000);
......@@ -107,7 +117,6 @@ namespace DeviceLibrary
{
lock (serverclock)
{
retry:
Operation operation = getLineBoxStatus();
if (!string.IsNullOrEmpty(posid))
operation.boxStatus[StoreID].data.Add(ParamDefine.posId, posid);
......@@ -117,14 +126,18 @@ namespace DeviceLibrary
LogUtil.info(JsonHelper.SerializeObject(operation));
if (RobotManage.InoutDebugMode)
return true;
Operation resultOperation = HttpHelper.Post(GetPostApi(), operation, false);
Operation resultOperation = HttpHelper.Post(GetPostApi(), operation, 5000);
if (resultOperation == null)
{
LogUtil.info($"SendStoreState error,posid:{posid}, storeStatus:{storeStatus}");
//goto retry;
return false;
}
if (operation.seq != resultOperation.seq) {
LogUtil.info($"SendStoreState seq error,posid:{posid}, storeStatus:{storeStatus}");
return false;
}
LogUtil.info($"SendStoreState success,posid:{posid}, storeStatus:{storeStatus}");
ResultProcess(resultOperation);
......@@ -267,7 +280,7 @@ namespace DeviceLibrary
printlog = true;
}
Operation resultOperation = HttpHelper.Post(GetPostApi(), lineOperation, printlog);
Operation resultOperation = HttpHelper.Post(GetPostApi(), lineOperation,700, printlog);
if (resultOperation != null)
getthtime = 0;
//LogUtil.info(JsonHelper.SerializeObject(resultOperation.data));
......@@ -376,17 +389,17 @@ namespace DeviceLibrary
return map;
if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH)
&& (RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.StringOut_Released
if (//RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH) &&
(RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.StringOut_Released
|| RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait))
{
map.Add(ParamDefine.doorStatus, "料串门关闭");
//map.Add(ParamDefine.doorStatus, "料串门关闭");
map[ParamDefine.openLock] = ParamDefine.enable;
}
else if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Open).Equals(IO_VALUE.HIGH))
//else// if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Open).Equals(IO_VALUE.HIGH))
{
map[ParamDefine.closeLock] = ParamDefine.enable;
map.Add(ParamDefine.doorStatus, "料串门打开");
//map.Add(ParamDefine.doorStatus, "料串门打开");
}
if (RobotManage.mainMachine.StringMoveInfo.MoveStep >= MoveStep.StringLoad_04
&& RobotManage.mainMachine.StringMoveInfo.MoveStep < MoveStep.StringOut_01)
......
DeviceLibrary/theMachine/BoxTransport.cs
......@@ -113,14 +113,13 @@ namespace DeviceLibrary
case MoveStep.StoreTS01:
if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
if (!IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture,Config,IO_VALUE.HIGH,5000))
Msg.add(crc.GetString(L.out_store_detect_material,"出库时料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
if (!IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
Msg.add(crc.GetString(L.out_store_detect_material, "出库时料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause("出库时料叉X30检测到有物料无法继续,请检查");
}
else
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
MoveInfo.NextMoveStep(MoveStep.StoreTS02);
MoveInfo.log($"{storeMoveType}:检查安全状态");
......
DeviceLibrary/theMachine/LabelParam.cs
......@@ -154,7 +154,7 @@ namespace DeviceLibrary
Comp_PL = Comp_PL < 0 ? 0 : Comp_PL;
posid = aCStorePosition.PositionNum;
Reel = reel.clone();
LogUtil.info($"BSP:{posid},Comp_PH:{Comp_PH}={aCStorePosition.BagHigh},Comp_PL:{Comp_PL}={reel.PlateH},Comp_PL_MM:{Config.Comp_PL_MM},{JsonHelper.SerializeObject(this)}");
LogUtil.info($"BSP:{posid},Comp_PH:{Comp_PH}={Config.Comp_P2}-({aCStorePosition.BagHigh}-{8}+{Config.Comp_PH_MM})*{Config.Clamp_PoToMM},Comp_PL:{Comp_PL}={reel.PlateH},Comp_PL_MM:{Config.Comp_PL_MM},{JsonHelper.SerializeObject(this)}");
}
public const string ngdoor = "单料口";
public const string strings = "料串口";
......
DeviceLibrary/theMachine/MainMachine _BtnProcess.cs
......@@ -51,12 +51,6 @@ namespace DeviceLibrary
}
LogUtil.info("按下启动按钮");
ProcessMsgEvent?.Invoke(Msg.get());
//未启动时按钮
//if (!RobotManage.isRunning)
//{
//
//}
}
}
}
DeviceLibrary/theMachine/MainMachine _IOMonitor.cs
......@@ -37,16 +37,16 @@ namespace DeviceLibrary
Current_Temperate = temp.Temperate;
//var tempIsOK = Current_Temperate < ServerCM.Max_Temperature;
var humiIsOK = Current_Humidity < ServerCM.Max_Humidity - ConfigHelper.Config.Get("Device_HumidityStartOffser", 1)
&& Current_Humidity > ServerCM.Max_Humidity - ConfigHelper.Config.Get("Device_HumidityEndOffser", 10);
var humiNeedStart = Current_Humidity > ServerCM.Max_Humidity - ConfigHelper.Config.Get("Device_HumidityStartOffser", 1);
var humiNeedStop = Current_Humidity < ServerCM.Max_Humidity - ConfigHelper.Config.Get("Device_HumidityEndOffser", 10);
if (!humiIsOK && !airisopen)
if (humiNeedStart && !airisopen)
{
IOMove(IO_Type.NitrogenValve, IO_VALUE.HIGH);
airisopen = true;
LogUtil.info($"开始吹气,当前最大湿度：{Current_Humidity} > {ServerCM.Max_Humidity}-{ConfigHelper.Config.Get("Device_HumidityStartOffser", 1)}.");
}
else if (humiIsOK && airisopen)
else if (humiNeedStop && airisopen)
{
IOMove(IO_Type.NitrogenValve, IO_VALUE.LOW);
airisopen = false;
......@@ -57,7 +57,7 @@ namespace DeviceLibrary
DateTime lastTHoutRangeTime = DateTime.MaxValue;
bool IsTHoutRange()
{
if (HumitureController.LastData.Humidity > ServerCM.Max_Humidity
if (HumitureController.LastData.Humidity > ServerCM.Max_Humidity// || HumitureController.LastData.Humidity < ServerCM.Min_Humidity
|| HumitureController.LastData.Temperate > ServerCM.Max_Temperature)
{
if (!lastTHoutRangeStatus)
......
DeviceLibrary/theMachine/MainMachine.cs
......@@ -305,7 +305,7 @@ namespace DeviceLibrary
return;
}
if (!ConfigHelper.Config.Get("Device_Disable_StringDoor", false))
CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
CylinderMove(ResetMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
break;
case MoveStep.H02_HomeReset_01:
ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset);
......
DeviceLibrary/theMachine/MainMachine_Store.cs
......@@ -162,9 +162,12 @@ namespace DeviceLibrary
case MoveStep.StoreOut12:
if (boxTransport.IsPutOnOut)
{
StoreMoveInfo.log($"料盘已到达目的地");
ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd);
if (!ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd))
{
Msg.add("服务器连接异常", MsgLevel.warning);
return;
}
StoreMoveInfo.log($"料盘已到达目的地");
if (StoreMoveInfo.MoveParam.IsNg)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!