Skip to content

李娜 / SO664-HCSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0212dd39 由 LN
选项

1

1 个父辈 6152572f
全部展开
内嵌 并排
正在显示 26 个修改的文件 包含 84 行增加 和 143 行删除
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -71,20 +71,20 @@
<Compile Include="AXIS\PanasonicServo\ACCMDManager.cs" />
<Compile Include="AXIS\PanasonicServo\ACServerManager.cs" />
<Compile Include="AXIS\PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="store\LineMoveP.cs" />
<Compile Include="store\LineAlarm.cs">
<Compile Include="bean\LineMoveP.cs" />
<Compile Include="bean\LineAlarm.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="store\model\AxisAlarmInfo.cs" />
<Compile Include="store\InOutParam.cs">
<Compile Include="bean\model\AxisAlarmInfo.cs" />
<Compile Include="bean\InOutParam.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="store\model\StoreMoveInfo.cs">
<Compile Include="bean\model\StoreMoveInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="store\KTK_Store.cs" />
<Compile Include="store\StoreStep.cs">
<Compile Include="bean\KTK_Store.cs" />
<Compile Include="bean\StoreStep.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
......@@ -109,19 +109,19 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="StoreConfig\AC\linePositions_2.csv">
<None Include="StoreConfig\linePositions_2.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\AC\linePositions_1.csv">
<None Include="StoreConfig\linePositions_1.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\AC\BoxConfig_2.csv">
<None Include="StoreConfig\BoxConfig_2.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\AC\BoxConfig_1.csv">
<None Include="StoreConfig\BoxConfig_1.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\AC\StoreConfig.csv">
<None Include="StoreConfig\StoreConfig.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
......
source/DeviceLibrary/acSingleStore/StoreBean.cs
......@@ -62,9 +62,9 @@ namespace OnlineStore.DeviceLibrary
Task.Factory.StartNew(delegate
{
IOManager.instance.ConnectionIOList(ioList);
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
//addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
//addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
//addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
......@@ -87,7 +87,7 @@ namespace OnlineStore.DeviceLibrary
}
#endregion
public override bool StartRun(bool isDebug = false)
public override bool StartRun( )
{
if (!canStart)
{
......@@ -333,54 +333,14 @@ namespace OnlineStore.DeviceLibrary
}
lastAutoRun = autoSingle;
}
//判断急停
else
{
{
BusyMoveProcess();
}
}
}
private IO_VALUE preAirValue = IO_VALUE.HIGH;
private void AirCheckProcess()
{
IO_VALUE currAirValue = IOValue(IO_Type.Airpressure_Check);
if (isInSuddenDown)
{
return;
}
if (isNoAirCheck)
{
return;
}
if (currAirValue.Equals(IO_VALUE.LOW))
{
//判断是否持续了3秒
if (preAirValue.Equals(IO_VALUE.LOW))
{
TimeSpan span = DateTime.Now - lastAirCloseTime;
if (span.TotalSeconds > Config.AirCheckSeconds)
{
WarnMsg = "未检测到气压信号";
preAirValue = IO_VALUE.LOW;
LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
Alarm(StoreAlarmType.NoAirCheck, "2", WarnMsg, StoreMoveType.None);
return;
}
}
else
{
lastAirCloseTime = DateTime.Now;
isNoAirCheck = false;
}
}
else
{
isNoAirCheck = false;
}
preAirValue = currAirValue;
}
public override void StopMove()
{
......
source/DeviceLibrary/acSingleStore/StoreManager.cs
......@@ -370,6 +370,6 @@ namespace OnlineStore.DeviceLibrary
public string msg { get; set; }
public Dictionary<string, string> data { get; set; }
public object data { get; set; }
}
}
source/DeviceLibrary/store/KTK_Store.cs → source/DeviceLibrary/bean/KTK_Store.cs
......@@ -57,31 +57,31 @@ namespace OnlineStore.DeviceLibrary
public StoreAlarmType alarmType = StoreAlarmType.None;
public AlarmInfo alarmInfo = new AlarmInfo();
/// <summary>
/// 记录上一次的部分IO状态，主要是急停，气压检测信号，复位信号，用来判断是否io发生改变
/// </summary>
public Dictionary<string, IO_VALUE> DILastValueMap = new Dictionary<string, IO_VALUE>();
///// <summary>
///// 记录上一次的部分IO状态，主要是急停，气压检测信号，复位信号，用来判断是否io发生改变
///// </summary>
//public Dictionary<string, IO_VALUE> DILastValueMap = new Dictionary<string, IO_VALUE>();
public object lastDiListLock = "";
public void addLastDI(string type, IO_VALUE value)
{
//public object lastDiListLock = "";
//public void addLastDI(string type, IO_VALUE value)
//{
try
{
lock (lastDiListLock)
{
if (DILastValueMap.ContainsKey(type))
{
DILastValueMap.Remove(type);
}
DILastValueMap.Add(type, value);
}
}
catch (Exception ex)
{
LogUtil.error(ex.ToString());
}
}
// try
// {
// lock (lastDiListLock)
// {
// if (DILastValueMap.ContainsKey(type))
// {
// DILastValueMap.Remove(type);
// }
// DILastValueMap.Add(type, value);
// }
// }
// catch (Exception ex)
// {
// LogUtil.error(ex.ToString());
// }
//}
public TimeSpan GetStoreRunTime()
......@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 开始运行
/// </summary>
public abstract bool StartRun(bool isDebug = false);
public abstract bool StartRun( );
/// <summary>
/// 停止运行
/// </summary>
......@@ -282,15 +282,7 @@ namespace OnlineStore.DeviceLibrary
}
return false;
}
protected bool AxisCountClear(ConfigMoveAxis moveAxis)
{
return true;
}
/// <summary>
/// 初始化
/// </summary>
protected virtual void Init()
{
if (!isInit)
......
source/DeviceLibrary/store/StoreStep.cs → source/DeviceLibrary/bean/StoreStep.cs
......@@ -279,17 +279,21 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
SO_25_InoutToP1,
/// <summary>
/// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）,关闭仓门
/// </summary>
SO_26_CloseDoor,
/// <summary>
/// 料仓出库，检测料仓门口信号
/// </summary>
SO_26_CheckTray,
SO_27_CheckTray,
/// <summary>
/// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
/// </summary>
SO_27_GoBack,
SO_28_GoBack,
/// <summary>
/// 等待拿走物品
/// </summary>
SO_28_WaitTake,
SO_29_WaitTake,
#endregion
......
source/HCSingleStore/App.config
......@@ -15,9 +15,9 @@
<!--storeType-->
<add key="store_count" value="2" />
<!--start one store config-->
<add key="Store_Position_Config" value="\StoreConfig\AC\linePositions.csv" />
<add key="Store_ConfigPath" value="\StoreConfig\AC\StoreConfig.csv" />
<add key="Box_ConfigPath" value="\StoreConfig\AC\BoxConfig.csv" />
<add key="Store_Position_Config" value="\StoreConfig\linePositions.csv" />
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
<add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_SA" />
<add key="Store_CID" value="D1" />
<add key="Store_CID_1" value="line-ac-01" />
......
source/HCSingleStore/FrmStore.cs
......@@ -56,7 +56,7 @@ namespace OnlineStore.ACSingleStore
{
开机自动启动ToolStripMenuItem.Text = "开机自动启动";
}
if (StoreManager.Store.UseBuzzer)
if (store.UseBuzzer)
{
启用蜂鸣器ToolStripMenuItem.Text = gouStr + " 启用蜂鸣器";
}
......@@ -396,7 +396,11 @@ namespace OnlineStore.ACSingleStore
//lblServerMsg.Text = HttpHelper.LastServerMsg;
ReadIOList();
string msg = "";
foreach(BoxBean box in StoreManager.Store.BoxMap.Values)
if (store.WarnMsg != "")
{
msg = store.Name+ store.WarnMsg;
}
foreach(BoxBean box in store.BoxMap.Values)
{
string s = box.GetWarnMsg();
if (!s.Equals(""))
......@@ -565,12 +569,12 @@ namespace OnlineStore.ACSingleStore
}
bool result = !启用蜂鸣器ToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(StoreManager.Store.UseBuzzer))
if (result.Equals(store.UseBuzzer))
{
return;
}
StoreManager.Store.UseBuzzer = result;
ConfigAppSettings.SaveValue(Setting_Init.UseBuzzer, (StoreManager.Store.UseBuzzer ? 1 : 0));
store.UseBuzzer = result;
ConfigAppSettings.SaveValue(Setting_Init.UseBuzzer, (store.UseBuzzer ? 1 : 0));
if (result)
{
启用蜂鸣器ToolStripMenuItem.Text = gouStr + " 启用蜂鸣器";
......
source/HCSingleStore/userControl/AxisMoveControl.cs
......@@ -86,16 +86,14 @@ namespace OnlineStore.AutoCountClient
}
private void btnOpenAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
//boxBean.RunAxis(false, axisList[comboBox1.SelectedIndex]);
LogUtil.info(boxBean.Name+"点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.ServoOn(PortName, SlvAddr);
}
private void btnCloseAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.ServoOff(PortName, SlvAddr);
//boxBean.CloseAxis(axisList[comboBox1.SelectedIndex]);
LogUtil.info(boxBean.Name+"点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.ServoOff(PortName, SlvAddr);
}
private void btnAxisAMove_Click(object sender, EventArgs e)
......@@ -106,7 +104,7 @@ namespace OnlineStore.AutoCountClient
}
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
LogUtil.info(boxBean.Name+"点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.AbsMove(PortName, SlvAddr, position, speed);
}
......@@ -118,7 +116,7 @@ namespace OnlineStore.AutoCountClient
}
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
LogUtil.info(boxBean.Name+"点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.RelMove(PortName, SlvAddr, position, speed);
}
......@@ -129,13 +127,13 @@ namespace OnlineStore.AutoCountClient
return;
}
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info(boxBean.Name+"点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAxisStop_Click(object sender, EventArgs e)
{
LogUtil.info("点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(boxBean.Name+"点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.SuddenStop(PortName, SlvAddr);
if (btnAddMove.BackColor == Color.Green)
{
......@@ -151,7 +149,7 @@ namespace OnlineStore.AutoCountClient
private void btnComAlarmClear_Click(object sender, EventArgs e)
{
LogUtil.info("点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(boxBean.Name+"点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.AlarmClear(PortName, SlvAddr);
Thread.Sleep(100);
AxisManager.instance.ServoOn(PortName, SlvAddr);
......@@ -168,7 +166,7 @@ namespace OnlineStore.AutoCountClient
{
if (a.IsSameAxis(PortName, SlvAddr))
{
LogUtil.info("点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info(boxBean.Name+"点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
AxisManager.instance.HomeMove(PortName, SlvAddr, speed,a.HomeLowSpeed,a.HomeAddSpeed);
}
......@@ -193,7 +191,7 @@ namespace OnlineStore.AutoCountClient
lblCountPulse.Text = AxisManager.instance.GetActualtPosition(PortName, SlvAddr).ToString();
}
private List<Color> colorsList = new List<Color>();
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox1.SelectedIndex >= 0)
......@@ -216,35 +214,19 @@ namespace OnlineStore.AutoCountClient
btnDelMove.Text = "点动- ";
txtASpeed.Text = targetSpeed.ToString();
int SelIndex = comboBox1.SelectedIndex;
if (SelIndex.Equals(0))
{
color = Color.Blue;
}
else if (SelIndex.Equals(1))
{
color = Color.Red;
}
else if (SelIndex.Equals(2))
{
color = Color.Green;
}
else if (SelIndex.Equals(3))
if (colorsList.Count <= 0)
{
color = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); ;
colorsList.Add(Color.Blue);
colorsList.Add(Color.Red);
colorsList.Add(Color.Green);
colorsList.Add(System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))));
colorsList.Add(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))));
colorsList.Add(Color.BlueViolet);
colorsList.Add(Color.Firebrick);
}
else if (SelIndex.Equals(4))
{
color = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
}
else if (SelIndex.Equals(5))
{
color = Color.BlueViolet;
}
else if (SelIndex.Equals(6))
{
color = Color.Firebrick;
}
color = colorsList[SelIndex];
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
......@@ -269,7 +251,7 @@ namespace OnlineStore.AutoCountClient
}
private void AxisMove(int speed)
{
LogUtil.info("【" + PortName + "_" + SlvAddr + "】点动： 速度：" + speed);
LogUtil.info(boxBean.Name+"【" + PortName + "_" + SlvAddr + "】点动： 速度：" + speed);
AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAddMove_MouseDown(object sender, MouseEventArgs e)
......
source/HuichuanLibrary/HuichuanLibrary.csproj
......@@ -46,7 +46,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Class1.cs" />
<Compile Include="FrmHuiChuanTest.cs">
<SubType>Form</SubType>
</Compile>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!