Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ee359df2 由 ke.sun
选项

.net改为4.0版本

1 个父辈 d3156d79
内嵌 并排
正在显示 13 个修改的文件 包含 90 行增加 和 94 行删除
source/ACSingleStore/ACSingleStore.csproj
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.ACSingleStore</RootNamespace> <RootNamespace>OnlineStore.ACSingleStore</RootNamespace>
<AssemblyName>ACSingleStore</AssemblyName> <AssemblyName>ACSingleStore</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
......
source/ACSingleStore/App.config
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
<add key="Store_CID" value="ac1"/> <add key="Store_CID" value="ac1"/>
<!--end one store config--> <!--end one store config-->
<!--康泰克运动默认参数：速度倍率，起始速度，目标速度，加速时间，减速时间，SSpeed,目标位置，默认运动轴--> <!--康泰克运动默认参数：速度倍率，起始速度，目标速度，加速时间，减速时间，SSpeed,目标位置，默认运动轴-->
<add key="KTK_MOVE_ResolveSpeed" value="10" /> <add key="KTK_MOVE_ResolveSpeed" value="10"/>
<add key="KTK_MOVE_StartSpeed" value="1000" /> <add key="KTK_MOVE_StartSpeed" value="1000"/>
<add key="KTK_MOVE_TargetSpeed" value="20000" /> <add key="KTK_MOVE_TargetSpeed" value="20000"/>
<add key="KTK_MOVE_AccelTime" value="500" /> <add key="KTK_MOVE_AccelTime" value="500"/>
<add key="KTK_MOVE_lDecelTime" value="500" /> <add key="KTK_MOVE_lDecelTime" value="500"/>
<add key="KTK_MOVE_SSpeed" value="5000" /> <add key="KTK_MOVE_SSpeed" value="5000"/>
<add key="KTK_MOVE_Distance" value="10000" /> <add key="KTK_MOVE_Distance" value="10000"/>
<add key="KTK_MOVE_AxisNo" value="1" /> <add key="KTK_MOVE_AxisNo" value="1"/>
</appSettings> </appSettings>
...@@ -50,6 +50,6 @@ ...@@ -50,6 +50,6 @@
</root> </root>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup> </startup>
</configuration> </configuration>
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox5.Location = new System.Drawing.Point(621, 71); this.groupBox5.Location = new System.Drawing.Point(621, 71);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(653, 203); this.groupBox5.Size = new System.Drawing.Size(643, 203);
this.groupBox5.TabIndex = 216; this.groupBox5.TabIndex = 216;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "伺服运动"; this.groupBox5.Text = "伺服运动";
...@@ -594,7 +594,7 @@ ...@@ -594,7 +594,7 @@
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(621, 477); this.groupBox3.Location = new System.Drawing.Point(621, 477);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(653, 166); this.groupBox3.Size = new System.Drawing.Size(643, 166);
this.groupBox3.TabIndex = 255; this.groupBox3.TabIndex = 255;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "硕科步进电机驱动器"; this.groupBox3.Text = "硕科步进电机驱动器";
...@@ -818,7 +818,7 @@ ...@@ -818,7 +818,7 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(621, 279); this.groupBox1.Location = new System.Drawing.Point(621, 279);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(414, 193); this.groupBox1.Size = new System.Drawing.Size(404, 193);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态"; this.groupBox1.Text = "伺服状态";
...@@ -1108,7 +1108,7 @@ ...@@ -1108,7 +1108,7 @@
// //
this.txtJiange.Location = new System.Drawing.Point(123, 65); this.txtJiange.Location = new System.Drawing.Point(123, 65);
this.txtJiange.Name = "txtJiange"; this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(37, 26); this.txtJiange.Size = new System.Drawing.Size(37, 23);
this.txtJiange.TabIndex = 221; this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "3"; this.txtJiange.Text = "3";
// //
...@@ -1752,7 +1752,7 @@ ...@@ -1752,7 +1752,7 @@
this.日志ToolStripMenuItem}); this.日志ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1286, 25); this.menuStrip1.Size = new System.Drawing.Size(1276, 25);
this.menuStrip1.TabIndex = 257; this.menuStrip1.TabIndex = 257;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
...@@ -1810,35 +1810,35 @@ ...@@ -1810,35 +1810,35 @@
// 查看IOToolStripMenuItem // 查看IOToolStripMenuItem
// //
this.查看IOToolStripMenuItem.Name = "查看IOToolStripMenuItem"; this.查看IOToolStripMenuItem.Name = "查看IOToolStripMenuItem";
this.查看IOToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.查看IOToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.查看IOToolStripMenuItem.Text = "查看IO"; this.查看IOToolStripMenuItem.Text = "查看IO";
this.查看IOToolStripMenuItem.Click += new System.EventHandler(this.查看IOToolStripMenuItem_Click); this.查看IOToolStripMenuItem.Click += new System.EventHandler(this.查看IOToolStripMenuItem_Click);
// //
// 料仓运转ONToolStripMenuItem // 料仓运转ONToolStripMenuItem
// //
this.料仓运转ONToolStripMenuItem.Name = "料仓运转ONToolStripMenuItem"; this.料仓运转ONToolStripMenuItem.Name = "料仓运转ONToolStripMenuItem";
this.料仓运转ONToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.料仓运转ONToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.料仓运转ONToolStripMenuItem.Text = "料仓运转ON"; this.料仓运转ONToolStripMenuItem.Text = "料仓运转ON";
this.料仓运转ONToolStripMenuItem.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click); this.料仓运转ONToolStripMenuItem.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
// //
// 料仓运转OFFToolStripMenuItem // 料仓运转OFFToolStripMenuItem
// //
this.料仓运转OFFToolStripMenuItem.Name = "料仓运转OFFToolStripMenuItem"; this.料仓运转OFFToolStripMenuItem.Name = "料仓运转OFFToolStripMenuItem";
this.料仓运转OFFToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.料仓运转OFFToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.料仓运转OFFToolStripMenuItem.Text = "料仓运转OFF"; this.料仓运转OFFToolStripMenuItem.Text = "料仓运转OFF";
this.料仓运转OFFToolStripMenuItem.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click); this.料仓运转OFFToolStripMenuItem.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
// //
// 打开舱门ToolStripMenuItem // 打开舱门ToolStripMenuItem
// //
this.打开舱门ToolStripMenuItem.Name = "打开舱门ToolStripMenuItem"; this.打开舱门ToolStripMenuItem.Name = "打开舱门ToolStripMenuItem";
this.打开舱门ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.打开舱门ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.打开舱门ToolStripMenuItem.Text = "打开仓门"; this.打开舱门ToolStripMenuItem.Text = "打开仓门";
this.打开舱门ToolStripMenuItem.Click += new System.EventHandler(this.打开舱门ToolStripMenuItem_Click); this.打开舱门ToolStripMenuItem.Click += new System.EventHandler(this.打开舱门ToolStripMenuItem_Click);
// //
// 关闭仓门ToolStripMenuItem // 关闭仓门ToolStripMenuItem
// //
this.关闭仓门ToolStripMenuItem.Name = "关闭仓门ToolStripMenuItem"; this.关闭仓门ToolStripMenuItem.Name = "关闭仓门ToolStripMenuItem";
this.关闭仓门ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.关闭仓门ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.关闭仓门ToolStripMenuItem.Text = "关闭仓门"; this.关闭仓门ToolStripMenuItem.Text = "关闭仓门";
this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click); this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click);
// //
...@@ -1997,7 +1997,7 @@ ...@@ -1997,7 +1997,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1286, 730); this.ClientSize = new System.Drawing.Size(1276, 730);
this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox4);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -890,37 +890,29 @@ namespace OnlineStore.ACSingleStore ...@@ -890,37 +890,29 @@ namespace OnlineStore.ACSingleStore
private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e) private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
{ {
//store.RunAxis(); store.RunAxis();
store.KNDIOMove(IO_Type.Run_Sign, IO_VALUE.HIGH); //store.KNDIOMove(IO_Type.Run_Sign, IO_VALUE.HIGH);
Thread.Sleep(1000); //Thread.Sleep(1000);
//打开三个轴 ////打开三个轴
foreach (ConfigMoveAxis SlvAddr in store.moveAxisList) //foreach (ConfigMoveAxis SlvAddr in store.moveAxisList)
{ //{
string portName = SlvAddr.DeviceName; // string portName = SlvAddr.DeviceName;
short slvAddr = SlvAddr.GetAxisValue(); // short slvAddr = SlvAddr.GetAxisValue();
ACServerManager.OpenPort(portName); // ACServerManager.OpenPort(portName);
//初始化串口 // //初始化串口
ACServerManager.InitSlvAddr(portName, slvAddr); // ACServerManager.InitSlvAddr(portName, slvAddr);
Thread.Sleep(100); // Thread.Sleep(100);
ACServerManager.AlarmClear(portName, slvAddr); // ACServerManager.AlarmClear(portName, slvAddr);
Thread.Sleep(100); // Thread.Sleep(100);
//打开伺服 // //打开伺服
ACServerManager.ServoOn(portName, slvAddr); // ACServerManager.ServoOn(portName, slvAddr);
} //}
Thread.Sleep(100); //Thread.Sleep(100);
// store.KNDIOMove(Store_IO_Type.Axis_Brake, IO_VALUE.HIGH); //store.KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.HIGH);
} }
private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e) private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
//if (!store.isScannerRun)
//{
// store.StartScanner(store.Config.Scanner_Ip,store.Config.Scanner_Port);
//}
//if (store.isScannerRun)
//{
// store.BeginScannering();
//}
} }
private void 打开舱门ToolStripMenuItem_Click(object sender, EventArgs e) private void 打开舱门ToolStripMenuItem_Click(object sender, EventArgs e)
...@@ -931,12 +923,14 @@ namespace OnlineStore.ACSingleStore ...@@ -931,12 +923,14 @@ namespace OnlineStore.ACSingleStore
private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e) private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e)
{ {
foreach (ConfigMoveAxis SlvAddr in store.moveAxisList) store.CloseAllAxis();
{ //store.KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
ACServerManager.ServoOff(SlvAddr.DeviceName, SlvAddr.GetAxisValue()); //foreach (ConfigMoveAxis SlvAddr in store.moveAxisList)
} //{
// ACServerManager.ServoOff(SlvAddr.DeviceName, SlvAddr.GetAxisValue());
//}
store.KNDIOMove(IO_Type.Run_Sign, IO_VALUE.LOW); //store.KNDIOMove(IO_Type.Run_Sign, IO_VALUE.LOW);
} }
private void 关闭仓门ToolStripMenuItem_Click(object sender, EventArgs e) private void 关闭仓门ToolStripMenuItem_Click(object sender, EventArgs e)
......
source/ACSingleStore/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.ACSingleStore.Properties { ...@@ -19,7 +19,7 @@ namespace OnlineStore.ACSingleStore.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
source/ACSingleStore/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace OnlineStore.ACSingleStore.Properties { ...@@ -12,7 +12,7 @@ namespace OnlineStore.ACSingleStore.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
source/Common/Common.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace> <RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/DeviceLibrary/DeviceLibrary.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.DeviceLibrary</RootNamespace> <RootNamespace>OnlineStore.DeviceLibrary</RootNamespace>
<AssemblyName>DeviceLibrary</AssemblyName> <AssemblyName>DeviceLibrary</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AxInterop.ActProgTypeLib"> <Reference Include="AxInterop.ActProgTypeLib">
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID
DI,急停,SuddenStop_BTN,200,192.168.0.10,0,急停,X01,DI-01,0 DI,急停,SuddenStop_BTN,200,192.168.200.10,0,急停,X01,DI-01,0
DI,复位,Reset_BTN,201,192.168.0.10,0,复位,X02,DI-02,0 DI,复位,Reset_BTN,201,192.168.200.10,0,复位,X02,DI-02,0
DI,自动,AutoRun_Single,202,192.168.0.10,0,自动,X03,DI-03,0 DI,自动,AutoRun_Single,202,192.168.200.10,0,自动,X03,DI-03,0
DI,气压检测,Airpressure_Check,203,192.168.0.10,0,气压检测,X04,DI-04,0 DI,气压检测,Airpressure_Check,203,192.168.200.10,0,气压检测,X04,DI-04,0
DI,料盘检测1,TrayCheck_1,204,192.168.0.10,0,料盘检测1,X05,DI-05,0 DI,料盘检测1,TrayCheck_1,204,192.168.200.10,0,料盘检测1,X05,DI-05,0
DI,料盘检测2,TrayCheck_2,205,192.168.0.10,0,料盘检测2,X06,DI-06,0 DI,料盘检测2,TrayCheck_2,205,192.168.200.10,0,料盘检测2,X06,DI-06,0
DI,进料口门上升端,Door_Up,206,192.168.0.10,0,进料口门上升端,X07,DI-07,0 DI,进料口门上升端,Door_Up,206,192.168.200.10,0,进料口门上升端,X07,DI-07,0
DI,进料口门下降端,Door_Down,207,192.168.0.10,0,进料口门下降端,X08,DI-08,0 DI,进料口门下降端,Door_Down,207,192.168.200.10,0,进料口门下降端,X08,DI-08,0
DI,定位气缸上升端,LocationCylinder_Up,208,192.168.0.10,0,定位气缸上升端,X09,DI-09,0 DI,定位气缸上升端,LocationCylinder_Up,208,192.168.200.10,0,定位气缸上升端,X09,DI-09,0
DI,定位气缸下降端,LocationCylinder_Down,209,192.168.0.10,0,定位气缸下降端,X10,DI-10,0 DI,定位气缸下降端,LocationCylinder_Down,209,192.168.200.10,0,定位气缸下降端,X10,DI-10,0
DI,左侧门限位,Left_Door_LimitSingle,210,192.168.0.10,0,左侧门限位,X11,DI-11,0 DI,左侧门限位,Left_Door_LimitSingle,210,192.168.200.10,0,左侧门限位,X11,DI-11,0
DI,右侧门限位,Right_Door_LimitSingle,211,192.168.0.10,0,右侧门限位,X12,DI-12,0 DI,右侧门限位,Right_Door_LimitSingle,211,192.168.200.10,0,右侧门限位,X12,DI-12,0
DI,料盘检测3,TrayCheck_3,212,192.168.0.10,0,料盘检测3,X13,DI-13,0 DI,料盘检测3,TrayCheck_3,212,192.168.200.10,0,料盘检测3,X13,DI-13,0
DI,料盘检测4,TrayCheck_4,213,192.168.0.10,0,料盘检测4,X14,DI-14,0 DI,料盘检测4,TrayCheck_4,213,192.168.200.10,0,料盘检测4,X14,DI-14,0
DO,自动指示灯,AutoRun_HddLed,100,192.168.0.10,0,自动指示灯,Y01,DO-01,0 DO,自动指示灯,AutoRun_HddLed,100,192.168.200.10,0,自动指示灯,Y01,DO-01,0
DO,故障指示灯,Alarm_HddLed,101,192.168.0.10,0,故障指示灯,Y02,DO-02,0 DO,故障指示灯,Alarm_HddLed,101,192.168.200.10,0,故障指示灯,Y02,DO-02,0
DO,待机指示灯,RunSign_HddLed,102,192.168.0.10,0,待机指示灯,Y03,DO-03,0 DO,待机指示灯,RunSign_HddLed,102,192.168.200.10,0,待机指示灯,Y03,DO-03,0
DO,吹气SOL ON,StartOrStopBlow,103,192.168.0.10,0,吹气SOL ON,Y04,DO-04,0 DO,吹气SOL ON,StartOrStopBlow,103,192.168.200.10,0,吹气SOL ON,Y04,DO-04,0
DO,料仓运转ON,Run_Sign,104,192.168.0.10,0,料仓运转ON,Y05,DO-05,0 DO,料仓运转ON,Run_Sign,104,192.168.200.10,0,料仓运转ON,Y05,DO-05,0
DO,轴2刹车电源ON,Axis_Brake,105,192.168.0.10,0,轴2刹车电源ON,Y06,DO-06,0 DO,轴2刹车电源ON,Axis_Brake,105,192.168.200.10,0,轴2刹车电源ON,Y06,DO-06,0
DO,进料口门上升SOL,Door_Up,106,192.168.0.10,0,进料口门上升SOL,Y07,DO-07,0 DO,进料口门上升SOL,Door_Up,106,192.168.200.10,0,进料口门上升SOL,Y07,DO-07,0
DO,进料口门下降SOL,Door_Down,107,192.168.0.10,0,进料口门下降SOL,Y08,DO-08,0 DO,进料口门下降SOL,Door_Down,107,192.168.200.10,0,进料口门下降SOL,Y08,DO-08,0
DO,定位上升SOL,LocationCylinder_Up,108,192.168.0.10,0,定位上升SOL,Y09,DO-09,0 DO,定位上升SOL,LocationCylinder_Up,108,192.168.200.10,0,定位上升SOL,Y09,DO-09,0
DO,定位下降SOL,LocationCylinder_Down,109,192.168.0.10,0,定位下降SOL,Y10,DO-10,0 DO,定位下降SOL,LocationCylinder_Down,109,192.168.200.10,0,定位下降SOL,Y10,DO-10,0
DO,相机照明开,CameraLight_Power,110,192.168.0.10,0,相机照明开,Y11,DO-11,0 DO,相机照明开,CameraLight_Power,110,192.168.200.10,0,相机照明开,Y11,DO-11,0
AXIS,（轴一）旋转轴,Middle_Axis,1,COM3,0,,,, AXIS,（轴一）旋转轴,Middle_Axis,1,COM3,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM4,0,,,, AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM4,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,1,COM5,0,,,, AXIS,（轴三）进出轴,InOut_Axis,1,COM5,0,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.0.14,,,,,, PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-886,,,,,, PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-886,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-900,,,,,, PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-900,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,-900,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,-900,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -589,7 +589,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -589,7 +589,7 @@ namespace OnlineStore.DeviceLibrary
public void RunAxis() public void RunAxis()
{ {
KNDIOMove(IO_Type.Run_Sign, IO_VALUE.HIGH); KNDIOMove(IO_Type.Run_Sign, IO_VALUE.HIGH);
Thread.Sleep(100); Thread.Sleep(1000);
//打开所有轴 //打开所有轴
foreach (ConfigMoveAxis moveAxis in moveAxisList) foreach (ConfigMoveAxis moveAxis in moveAxisList)
{ {
...@@ -602,8 +602,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -602,8 +602,7 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(100); Thread.Sleep(100);
//打开伺服 //打开伺服
ACServerManager.ServoOn(portName, slvAddr); ACServerManager.ServoOn(portName, slvAddr);
} }
KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.HIGH); KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.HIGH);
} }
...@@ -646,7 +645,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -646,7 +645,7 @@ namespace OnlineStore.DeviceLibrary
return true; return true;
} }
private void CloseAllAxis() public void CloseAllAxis()
{ {
KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.LOW); KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
foreach (ConfigMoveAxis axis in moveAxisList) foreach (ConfigMoveAxis axis in moveAxisList)
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace> <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName> <AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/UserFromControl/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties { ...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
source/UserFromControl/UserFromControl.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserFromControl</RootNamespace> <RootNamespace>UserFromControl</RootNamespace>
<AssemblyName>UserFromControl</AssemblyName> <AssemblyName>UserFromControl</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!