Skip to content

李娜 / TinPasteStore

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

搅拌轴增加转速显示，配置的速度单位改为转速。

1 个父辈 42b30212
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 58 行增加 和 18 行删除
dll/DeviceLib.dll
此文件类型无法预览
source/ACSingleStore/FrmStoreBox.cs
......@@ -697,12 +697,12 @@ namespace OnlineStore.TinPasteStore
private void btnStirP1_Click(object sender, EventArgs e)
{
AxisABSMove(store.Config.Stir_Axis, txtStirP1, store.Config.StirAxis_P1_Speed);
AxisABSMove(store.Config.Stir_Axis, txtStirP1, store.Config.GetStirAxis_P1_Speed());
}
private void btnStirP2_Click(object sender, EventArgs e)
{
AxisABSMove(store.Config.Stir_Axis, txtStirP2, store.Config.StirAxis_P2_Speed);
AxisABSMove(store.Config.Stir_Axis, txtStirP2, store.Config.GetStirAxis_P2_Speed());
}
#endregion
......
source/ACSingleStore/useControl/AxisMoveControl.cs
......@@ -22,9 +22,9 @@ namespace OnlineStore.ACPackingStore
private TinStoreBean BoxBean= null;
private string PortName = "";
private int SlvAddr = 0;
public AxisMoveControl( )
{
{
InitializeComponent();
}
public void LoadData(TinStoreBean boxBean, params ConfigMoveAxis[] moveAxis)
......@@ -161,11 +161,26 @@ namespace OnlineStore.ACPackingStore
this.txtHomeSingle.Text = ACServerManager.GetHomeSingle(PortName, SlvAddr).ToString();
this.txtLimit1.Text = ACServerManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
this.txtLimit2.Text = ACServerManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
int speed = ACServerManager.GetActualSpeed(PortName, SlvAddr);
this.txtS.Text = speed.ToString();
if (axis != null && axis.SpeedChangeV != 1)
{
int r =(int) Math.Round(speed / axis.SpeedChangeV);
lblSpeed.Text = "转速：" + r;
}
else
{
lblSpeed.Text = "";
}
UpdatePosition();
}
private void btnReadPosition_Click(object sender, EventArgs e)
{
ReadPosistion();
UpdatePosition();
}
private void ReadPosistion()
......@@ -203,11 +218,12 @@ namespace OnlineStore.ACPackingStore
}
}
}
private ConfigMoveAxis axis = null;
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox1.SelectedIndex >= 0)
{
ConfigMoveAxis axis = axisList[comboBox1.SelectedIndex];
{
axis = axisList[comboBox1.SelectedIndex];
PortName = axis.DeviceName;
SlvAddr = axis.GetAxisValue();
txtAxisDeviceName.Text = PortName;
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
......@@ -124,8 +124,9 @@ PRO,回温区旋转轴（轴4）P1速度,WarmingAxis_P1_Speed,500,,,,,,,,,,,,,,
PRO,回温区旋转轴（轴4）P2速度,WarmingAxis_P2_Speed,500,,,,,,,,,,,,,,
PRO,冷藏区旋转轴（轴5）P1速度（匀速运动速度）,ColdingAxis_P1_Speed,500,,,,,,,,,,,,,,
PRO,冷藏区旋转轴（轴5）P2速度,ColdingAxis_P2_Speed,500,,,,,,,,,,,,,,
PRO,搅拌区旋转轴（轴6）P1速度（匀速运动速度）,StirAxis_P1_Speed,400,,,,,,,,,,,,,,
PRO,搅拌区旋转轴（轴6）P2速度,StirAxis_P2_Speed,100,,,,,,,,,,,,,,
PRO,搅拌区旋转轴（轴6）P1速度_转速需要X系数（匀速运动速度）,StirAxis_P1_Speed,400,,,,,,,,,,,,,,
PRO,搅拌区旋转轴（轴6）P2速度_转速需要X系数,StirAxis_P2_Speed,100,,,,,,,,,,,,,,
PRO,搅拌区旋转轴（轴6）速度和转速系数,StirAxis_Speed_Change,3.2,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,
PRO,伺服停止时可误差的脉冲数的最小值,Axis_ErrorCountMin,10,,,,,,,,,,,,,,
PRO,伺服停止时可误差的脉冲数的最大值,Axis_ErrorCountMax,1000,,,,,,,,,,,,,,
......
source/DeviceLibrary/acTinStore/TinStoreBean.cs
......@@ -231,7 +231,7 @@ namespace OnlineStore.DeviceLibrary
ResetLog("复位：旋转轴，升降轴，搅拌轴到待机点");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_OL_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P1, Config.StirAxis_P1_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P1, Config.GetStirAxis_P1_Speed());
break;
case StoreMoveStep.R04_AxisToP1:
MoveInfo.NextMoveStep(StoreMoveStep.R05_StartWork);
......@@ -267,7 +267,7 @@ namespace OnlineStore.DeviceLibrary
if (CurrStirInfo.StopTime > DateTime.Now)
{
LogUtil.info(Name + "搅拌区【" + CurrStirInfo.StirParam.LogName + "】状态【" + CurrStirInfo.MoveStatus + "】结束时间【" + CurrStirInfo.StopTime.ToLongTimeString() + "】开始继续搅拌 ");
ACServerManager.SpeedMove(Config.Stir_Axis.DeviceName, Config.Stir_Axis.GetAxisValue(), Config.StirAxis_P1_Speed);
ACServerManager.SpeedMove(Config.Stir_Axis.DeviceName, Config.Stir_Axis.GetAxisValue(), Config.GetStirAxis_P1_Speed());
}
}
break;
......@@ -291,6 +291,8 @@ namespace OnlineStore.DeviceLibrary
{
TieStoreConfig.ConfigAxis(Config);
Config.Stir_Axis.SpeedChangeV = Config.StirAxis_Speed_Change;
moveAxisList = new List<ConfigMoveAxis>();
moveAxisList.Add(Config.Middle_Axis);
moveAxisList.Add(Config.UpDown_Axis);
......
source/DeviceLibrary/acTinStore/TinStoreBean_Partial.cs
......@@ -379,7 +379,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog(" 送料1搅拌：移动到搅拌位置，升降轴到搅拌区高点P101 [" + Config.UpDownAxis_StirH_P101 + "],旋转轴到P101 [" + Config.UpDownAxis_StirH_P101 + "], 搅拌轴到P1[" + Config.Stir_Axis_P1 + "]");
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_StirH_P101, Config.UpDownAxis_P101_Speed);
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_Stir_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P1, Config.StirAxis_P1_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P1, Config.GetStirAxis_P1_Speed());
}
else if (MoveInfo.IsStep(StoreMoveStep.ST_09_MoveToStir))
{
......@@ -497,7 +497,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog(" 送料2搅拌：移动到搅拌位置，升降轴到搅拌区高点P101["+ Config.MiddleAxis_Stir_P101 + "],旋转轴到P101 ["+ Config.UpDownAxis_StirH_P101 + "], 搅拌轴到P2["+ Config.Stir_Axis_P2 + "]");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_Stir_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_StirH_P101, Config.UpDownAxis_P101_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P2, Config.StirAxis_P2_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P2, Config.GetStirAxis_P2_Speed());
}
else if (MoveInfo.IsStep(StoreMoveStep.ST_29_MoveToStir))
{
......@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.ST_41_StartStir);
OutStoreLog(" 搅拌：开始搅拌，回温轴，搅拌轴，开始匀速旋转");
ACServerManager.SpeedMove(Config.Stir_Axis.DeviceName, Config.Stir_Axis.GetAxisValue(), Config.StirAxis_P1_Speed);
ACServerManager.SpeedMove(Config.Stir_Axis.DeviceName, Config.Stir_Axis.GetAxisValue(), Config.GetStirAxis_P1_Speed());
StartWork(2);
UpdateCurrStirState(3,MoveInfo.MoveParam.StirSecsond );
if (MoveInfo.MoveParam.TarPosition.PosType >= 100)
......@@ -578,7 +578,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog(" 搅拌1回库：移动到搅拌位置，升降轴到搅拌区低点P102 ["+ Config.UpDownAxis_StirL_P102 + "]，旋转轴到P101 ["+ Config.MiddleAxis_Stir_P101 + "], 搅拌轴到P1["+ Config.Stir_Axis_P1 + "]");
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_StirL_P102, Config.UpDownAxis_P102_Speed);
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_Stir_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P1, Config.StirAxis_P1_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P1, Config.GetStirAxis_P1_Speed());
}
else if (MoveInfo.IsStep(StoreMoveStep.SR_52_MoveToStir))
{
......@@ -667,7 +667,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog(" 搅拌2回库：移动到搅拌位置，升降轴到搅拌区低点P102 ["+ Config.UpDownAxis_StirL_P102 + "]，旋转轴到P101 ["+ Config.MiddleAxis_Stir_P101 + "], 搅拌轴到P2 ["+ Config.Stir_Axis_P2 + "]");
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_StirL_P102, Config.UpDownAxis_P102_Speed);
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_Stir_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P2, Config.StirAxis_P2_Speed);
ACAxisMove(Config.Stir_Axis, Config.Stir_Axis_P2, Config.GetStirAxis_P2_Speed());
UpdateLastStatus(StoreStatus.Mix_Putting, MoveInfo.MoveParam.TarPosId);
}
else if (MoveInfo.IsStep(StoreMoveStep.SR_72_MoveToStir))
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
......@@ -136,6 +136,12 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[CSVAttribute("脉冲最大限位")]
public int PositionMax { get; set; }
/// <summary>
/// 速度转换系数，只有搅拌轴使用
/// </summary>
public float SpeedChangeV { get; set; } = 1;
public string GetNameStr()
{
return DeviceName + "_" + GetAxisValue();
......
source/LoadCVSLibrary/storeConfig/config/TieStoreConfig.cs
......@@ -313,15 +313,30 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("ColdingAxis_P2_Speed")]
public int ColdingAxis_P2_Speed { get; set; }
/// <summary>
/// PRO,搅拌区旋转轴（轴6）P1速度,StirAxis_P1_Speed,120,,,,,,,
/// PRO,搅拌区旋转轴（轴6）P1速度_转速需要X系数,StirAxis_P1_Speed,120,,,,,,,
/// </summary>
[ConfigProAttribute("StirAxis_P1_Speed")]
public int StirAxis_P1_Speed { get; set; }
public int StirAxis_P1_Speed { get ; set; }
/// <summary>
/// PRO,搅拌区旋转轴（轴6）P2速度,StirAxis_P2_Speed,120,,,,,,,
/// PRO,搅拌区旋转轴（轴6）P2速度_转速需要X系数,StirAxis_P2_Speed,120,,,,,,,
/// </summary>
[ConfigProAttribute("StirAxis_P2_Speed")]
public int StirAxis_P2_Speed { get; set; }
public int GetStirAxis_P1_Speed()
{
return (int)(StirAxis_P1_Speed * StirAxis_Speed_Change);
}
public int GetStirAxis_P2_Speed()
{
return (int)(StirAxis_P2_Speed * StirAxis_Speed_Change);
}
/// <summary>
/// PRO,搅拌区旋转轴（轴6）速度和转速系数,StirAxis_Speed_Change,100,,,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("StirAxis_Speed_Change")]
public float StirAxis_Speed_Change { get; set; } = 1;
/// <summary>
/// PRO,伺服停止时可误差的脉冲数的最小值,Axis_ErrorCountMin,10,,,,,,,
/// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!